diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 3d7e580ca..1b3479ed2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -3826,8 +3826,36 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .reason(chargingStartupResult.getFailReason()) .build(); + BigDecimal sharpElectricityPrice = BigDecimal.ZERO; + BigDecimal sharpServicePrice = BigDecimal.ZERO; + BigDecimal sharpPrice = BigDecimal.ZERO; + + BigDecimal peakElectricityPrice = BigDecimal.ZERO; + BigDecimal peakServicePrice = BigDecimal.ZERO; + BigDecimal peakPrice = BigDecimal.ZERO; + + BigDecimal flatElectricityPrice = BigDecimal.ZERO; + BigDecimal flatServicePrice = BigDecimal.ZERO; + BigDecimal flatPrice = BigDecimal.ZERO; + + BigDecimal valleyElectricityPrice = BigDecimal.ZERO; + BigDecimal valleyServicePrice = BigDecimal.ZERO; + BigDecimal valleyPrice = BigDecimal.ZERO; + OrderDetail orderDetail = OrderDetail.builder() .orderCode(orderCode) + .sharpElectricityPrice(sharpElectricityPrice) + .sharpServicePrice(sharpServicePrice) + .sharpPrice(sharpPrice) + .peakElectricityPrice(peakElectricityPrice) + .peakServicePrice(peakServicePrice) + .peakPrice(peakPrice) + .flatElectricityPrice(flatElectricityPrice) + .flatServicePrice(flatServicePrice) + .flatPrice(flatPrice) + .valleyElectricityPrice(valleyElectricityPrice) + .valleyServicePrice(valleyServicePrice) + .valleyPrice(valleyPrice) .delFlag(DelFlagEnum.NORMAL.getValue()) .build(); diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index c802de69f..8575fd3f9 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -2547,7 +2547,7 @@ AND t1.create_time = ]]> #{startTime,jdbcType=VARCHAR} AND t1.create_time #{endTime,jdbcType=VARCHAR} - AND t1.order_status = '6' + AND t1.del_flag = '0' order by t1.create_time desc