diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index f9847efc5..6cb094405 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -319,13 +319,6 @@ public abstract class AbstractProgramLogic implements InitializingBean { // 该时段金额 = 该时段电费 + 该时段服务费 BigDecimal amount = electricityAmount.add(serviceAmount); - // if (data.getSharpPrice() != null) { - // orderDetail.setSharpPrice(new BigDecimal(data.getSharpPrice())); - // } - // if (data.getSharpAmount() != null) { - // orderDetail.setSharpAmount(new BigDecimal(data.getSharpAmount())); - // } - orderDetail.setSharpPrice(price); orderDetail.setSharpAmount(amount); logger.info("更新订单详情:【{}】, 当前为尖时段, 时段单价:{}(电费单价:{}+服务费单价:{}), 耗电量:{}, 平台计算该时段消费金额:{}(电费:{}+服务费:{}), 桩传的单价:{}, 桩传的金额:{}", @@ -360,13 +353,6 @@ public abstract class AbstractProgramLogic implements InitializingBean { // 该时段金额 = 该时段电费 + 该时段服务费 BigDecimal amount = electricityAmount.add(serviceAmount); - // if (data.getPeakPrice() != null) { - // orderDetail.setPeakPrice(new BigDecimal(data.getPeakPrice())); - // } - // if (data.getPeakAmount() != null) { - // orderDetail.setPeakAmount(new BigDecimal(data.getPeakAmount())); - // } - orderDetail.setPeakPrice(price); orderDetail.setPeakAmount(amount); @@ -402,13 +388,6 @@ public abstract class AbstractProgramLogic implements InitializingBean { // 该时段金额 = 该时段电费 + 该时段服务费 BigDecimal amount = electricityAmount.add(serviceAmount); - // if (data.getFlatPrice() != null) { - // orderDetail.setFlatPrice(new BigDecimal(data.getFlatPrice())); - // } - // if (data.getFlatAmount() != null) { - // orderDetail.setFlatAmount(new BigDecimal(data.getFlatAmount())); - // } - orderDetail.setFlatPrice(price); orderDetail.setFlatAmount(amount); @@ -444,13 +423,6 @@ public abstract class AbstractProgramLogic implements InitializingBean { // 该时段金额 = 该时段电费 + 该时段服务费 BigDecimal amount = electricityAmount.add(serviceAmount); - // if (data.getValleyPrice() != null) { - // orderDetail.setValleyPrice(new BigDecimal(data.getValleyPrice())); - // } - // if (data.getValleyAmount() != null) { - // orderDetail.setValleyAmount(new BigDecimal(data.getValleyAmount())); - // } - orderDetail.setValleyPrice(price); orderDetail.setValleyAmount(amount);