diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index f6c538a..0960f9a 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -1465,9 +1465,13 @@ public class OrdersServiceImpl extends ServiceImpl 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 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);