项目加钟时将待补单技师项目收益放到old字段中
This commit is contained in:
parent
2d233c2394
commit
f4b6b7604a
|
@ -1465,9 +1465,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
|||
orders.setOldMassageDuration(oldOrders.getDuration());
|
||||
orders.setOldArtificerMoney(oldOrders.getArtificerMoney());
|
||||
orders.setArtificerTaxiMoney(oldOrders.getArtificerTaxiMoney());
|
||||
if(oldOrders.getIsSupplement().equals(1)){
|
||||
BigDecimal projectBenefits = oldOrders.getProjectBenefits().add(oldOrders.getOldProjectBenefits());
|
||||
orders.setOldProjectBenefits(projectBenefits);
|
||||
if(oldOrders.getIsSupplement()!=null){
|
||||
if(oldOrders.getIsSupplement().equals(1)){
|
||||
BigDecimal projectBenefits = oldOrders.getProjectBenefits().add(oldOrders.getOldProjectBenefits());
|
||||
orders.setOldProjectBenefits(projectBenefits);
|
||||
}else{
|
||||
orders.setOldProjectBenefits(oldOrders.getProjectBenefits());
|
||||
}
|
||||
}else{
|
||||
orders.setOldProjectBenefits(oldOrders.getProjectBenefits());
|
||||
}
|
||||
|
@ -6130,7 +6134,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
|||
return Result.success();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 技师数据统计
|
||||
* @param artificerId
|
||||
* @param startTime
|
||||
* @param endTime
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public Result selectArtificerIndex(Long artificerId, String startTime, String endTime) {
|
||||
Artificer artificer = artificerService.getById(artificerId);
|
||||
|
|
Loading…
Reference in New Issue