yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目加钟时将待补单技师项目收益放到old字段中

This commit is contained in:
曹磊 2024-07-11 15:00:23 +08:00
parent 2d233c2394
commit f4b6b7604a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

@ -1465,9 +1465,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
orders.setOldMassageDuration(oldOrders.getDuration()); orders.setOldMassageDuration(oldOrders.getDuration());
orders.setOldArtificerMoney(oldOrders.getArtificerMoney()); orders.setOldArtificerMoney(oldOrders.getArtificerMoney());
orders.setArtificerTaxiMoney(oldOrders.getArtificerTaxiMoney()); orders.setArtificerTaxiMoney(oldOrders.getArtificerTaxiMoney());
if(oldOrders.getIsSupplement().equals(1)){ if(oldOrders.getIsSupplement()!=null){
BigDecimal projectBenefits = oldOrders.getProjectBenefits().add(oldOrders.getOldProjectBenefits()); if(oldOrders.getIsSupplement().equals(1)){
orders.setOldProjectBenefits(projectBenefits); BigDecimal projectBenefits = oldOrders.getProjectBenefits().add(oldOrders.getOldProjectBenefits());
orders.setOldProjectBenefits(projectBenefits);
}else{
orders.setOldProjectBenefits(oldOrders.getProjectBenefits());
}
}else{ }else{
orders.setOldProjectBenefits(oldOrders.getProjectBenefits()); orders.setOldProjectBenefits(oldOrders.getProjectBenefits());
} }
@ -6130,7 +6134,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
return Result.success(); return Result.success();
} }
/**
* 技师数据统计
* @param artificerId
* @param startTime
* @param endTime
* @return
*/
@Override @Override
public Result selectArtificerIndex(Long artificerId, String startTime, String endTime) { public Result selectArtificerIndex(Long artificerId, String startTime, String endTime) {
Artificer artificer = artificerService.getById(artificerId); Artificer artificer = artificerService.getById(artificerId);