diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index 1c5287766..8ef31a78e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -18,6 +18,7 @@ import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.adapay.AdapayStatusEnum; import com.jsowell.common.enums.ykc.*; import com.jsowell.common.exception.BusinessException; +import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.*; import com.jsowell.pile.dto.ApplyRefundDTO; @@ -652,6 +653,7 @@ public class TempService { for (OrderBasicInfo orderBasicInfo : orderBasicInfos) { orderBasicInfo.setOrderAmount(orderBasicInfo.getOrderAmount().multiply(multiple)); orderBasicInfo.setVirtualAmount(orderBasicInfo.getVirtualAmount().multiply(multiple)); + orderBasicInfo.setUpdateTime(DateUtils.getNowDate()); } // 查询订单详情数据 List orderDetailList = orderBasicInfoService.getOrderDetailList(orderCodeList); @@ -667,23 +669,28 @@ public class TempService { // 尖时段 if (orderDetail.getSharpUsedElectricity() != null && orderDetail.getSharpUsedElectricity().compareTo(BigDecimal.ZERO) > 0) { orderDetail.setSharpUsedElectricity(orderDetail.getSharpUsedElectricity().multiply(multiple)); - orderDetail.setSharpAmount(orderDetail.getSharpAmount().multiply(multiple)); + // orderDetail.setSharpAmount(orderDetail.getSharpAmount().multiply(multiple)); + orderDetail.setSharpAmount(orderDetail.getSharpPrice().multiply(orderDetail.getSharpUsedElectricity())); } // 峰时段 if (orderDetail.getPeakUsedElectricity() != null && orderDetail.getPeakUsedElectricity().compareTo(BigDecimal.ZERO) > 0) { orderDetail.setPeakUsedElectricity(orderDetail.getPeakUsedElectricity().multiply(multiple)); - orderDetail.setPeakAmount(orderDetail.getPeakAmount().multiply(multiple)); + // orderDetail.setPeakAmount(orderDetail.getPeakAmount().multiply(multiple)); + orderDetail.setPeakAmount(orderDetail.getPeakPrice().multiply(orderDetail.getPeakUsedElectricity())); } // 平时段 if (orderDetail.getFlatUsedElectricity() != null && orderDetail.getFlatUsedElectricity().compareTo(BigDecimal.ZERO) > 0) { orderDetail.setFlatUsedElectricity(orderDetail.getFlatUsedElectricity().multiply(multiple)); - orderDetail.setFlatAmount(orderDetail.getFlatAmount().multiply(multiple)); + // orderDetail.setFlatAmount(orderDetail.getFlatAmount().multiply(multiple)); + orderDetail.setFlatAmount(orderDetail.getFlatPrice().multiply(orderDetail.getFlatUsedElectricity())); } // 谷时段 if (orderDetail.getValleyUsedElectricity() != null && orderDetail.getValleyUsedElectricity().compareTo(BigDecimal.ZERO) > 0) { orderDetail.setValleyUsedElectricity(orderDetail.getValleyUsedElectricity().multiply(multiple)); - orderDetail.setValleyAmount(orderDetail.getValleyAmount().multiply(multiple)); + // orderDetail.setValleyAmount(orderDetail.getValleyAmount().multiply(multiple)); + orderDetail.setValleyAmount(orderDetail.getValleyPrice().multiply(orderDetail.getValleyUsedElectricity())); } + orderDetail.setUpdateTime(DateUtils.getNowDate()); } // 更新数据库 int updateCount = 0;