mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-15 04:39:50 +08:00
update 预约充电
This commit is contained in:
@@ -3826,8 +3826,36 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
|||||||
.reason(chargingStartupResult.getFailReason())
|
.reason(chargingStartupResult.getFailReason())
|
||||||
.build();
|
.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()
|
OrderDetail orderDetail = OrderDetail.builder()
|
||||||
.orderCode(orderCode)
|
.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())
|
.delFlag(DelFlagEnum.NORMAL.getValue())
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
|||||||
@@ -2547,7 +2547,7 @@
|
|||||||
<!--AND t1.member_id = #{memberId,jdbcType=VARCHAR}-->
|
<!--AND t1.member_id = #{memberId,jdbcType=VARCHAR}-->
|
||||||
AND t1.create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
|
AND t1.create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
|
||||||
AND t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
|
AND t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
|
||||||
AND t1.order_status = '6'
|
<!--AND t1.order_status = '6'-->
|
||||||
AND t1.del_flag = '0'
|
AND t1.del_flag = '0'
|
||||||
order by t1.create_time desc
|
order by t1.create_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
Reference in New Issue
Block a user