diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java index dcc374a8f..454b822f7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java @@ -484,5 +484,5 @@ public interface OrderBasicInfoService{ List getOrderDetailByStationIds(List stationIds, String startTime, String endTime); - void getBusinessOrderDetail(String orderCode); + BusinessOrderDetailInfoVO getBusinessOrderDetail(String orderCode); } 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 843360bf5..219cb7b5d 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 @@ -4040,13 +4040,27 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { * @param orderCode */ @Override - public void getBusinessOrderDetail(String orderCode) { + public BusinessOrderDetailInfoVO getBusinessOrderDetail(String orderCode) { + BusinessOrderDetailInfoVO vo = new BusinessOrderDetailInfoVO(); OrderVO orderVO = getChargeOrderInfoByOrderCode(orderCode); if (orderVO == null) { - return; + return vo; } - String createTime = orderVO.getCreateTime(); + vo.setCreateTime(orderVO.getCreateTime()); + vo.setStartChargeTime(orderVO.getStartTime()); + vo.setEndChargeTime(orderVO.getEndTime()); + vo.setReason(orderVO.getReason()); + vo.setSettleTime(orderVO.getSettlemetTime()); + vo.setPayTime(orderVO.getPayTime()); + vo.setOrderCode(orderVO.getOrderCode()); + vo.setStartMode(orderVO.getStartMode()); + vo.setPileSn(orderVO.getPileSn()); + vo.setPileConnectorCode(orderVO.getPileConnectorCode()); + vo.setEndSOC(orderVO.getEndSoc()); + vo.setChargeTime(orderVO.getChargingTime()); + vo.setChargeDegree(orderVO.getChargingDegree()); + return vo; } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderDetailInfoVO.java index b60b5fbb6..9903d49b5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderDetailInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderDetailInfoVO.java @@ -33,7 +33,7 @@ public class BusinessOrderDetailInfoVO { /** * 订单号 */ - // private String orderCode; + private String orderCode; /** * 站点id @@ -114,4 +114,65 @@ public class BusinessOrderDetailInfoVO { * 总充电量 */ private BigDecimal totalUsedElectricity; + + /** + * 开始充电时间 + */ + private String startChargeTime; + + /** + * 停止充电时间 + */ + private String endChargeTime; + + /** + * 停止原因 + */ + private String reason; + + /** + * 结算时间 + */ + private String settleTime; + + /** + * 支付时间 + */ + private String payTime; + + /** + * 站点名称 + */ + private String stationName; + + /** + * 启动方式 + */ + private String startMode; + + /** + * 桩编号 + */ + private String pileSn; + + /** + * 停止soc + */ + private String endSOC; + + /** + * 充电时长 + */ + private String chargeTime; + + /** + * 充电度数 + */ + private String chargeDegree; + + /** + * 订单创建时间 + */ + private String createTime; + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderVO.java index bbc61a289..6cc2c8b3e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderVO.java @@ -73,6 +73,11 @@ public class OrderVO { */ private BigDecimal virtualAmount; + /** + * 结算时间 + */ + private String settlemetTime; + /** * 结算金额(指实际产生的消费,包括本金支付,微信支付等) */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 6904937fe..4a9b0c112 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -2853,6 +2853,7 @@ t1.order_amount AS orderAmount, t1.plate_number AS plateNumber, t1.discount_amount AS discountAmount, + t1.settlement_time as settlemetTime, t1.settle_amount AS settleAmount, t1.create_time as createTime, t1.charge_start_time AS startTime,