diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java index fe4ace2fb..9b1f73cd1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java @@ -68,9 +68,9 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi } /** - * 修改【请填写功能名称】 + * 修改 * - * @param adapayMemberAccount 【请填写功能名称】 + * @param adapayMemberAccount * @return 结果 */ @Override 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 1034b2228..46480e761 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 @@ -192,19 +192,28 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { dto.setStationDeptIds(authorizedMap.getStationDeptIds()); dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds()); List orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto); - if (CollectionUtils.isNotEmpty(orderListVOS)) { - for (OrderListVO orderListVO : orderListVOS) { - // 如果是微信支付,通过订单号查询微信支付单号 - // logger.info("如果是微信支付,通过订单号查询微信支付单号 orderListVO:{}", JSON.toJSONString(orderListVO)); - if (StringUtils.equals(PaymentInstitutionsEnum.ADAPAY.getValue(), orderListVO.getPaymentInstitutions())) { - AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode()); - orderListVO.setOutTradeNo(adapayCallbackRecord.getPaymentId()); - } else if (StringUtils.equals(PaymentInstitutionsEnum.WECHAT_PAY.getValue(), orderListVO.getPaymentInstitutions())) { - WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode()); - orderListVO.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo()); - } - orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode()); - orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus())); + if (CollectionUtils.isEmpty(orderListVOS)) { + return orderListVOS; + } + for (OrderListVO orderListVO : orderListVOS) { + // 如果是微信支付,通过订单号查询微信支付单号 + // logger.info("如果是微信支付,通过订单号查询微信支付单号 orderListVO:{}", JSON.toJSONString(orderListVO)); + if (StringUtils.equals(PaymentInstitutionsEnum.ADAPAY.getValue(), orderListVO.getPaymentInstitutions())) { + AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode()); + orderListVO.setOutTradeNo(adapayCallbackRecord.getPaymentId()); + } else if (StringUtils.equals(PaymentInstitutionsEnum.WECHAT_PAY.getValue(), orderListVO.getPaymentInstitutions())) { + WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode()); + orderListVO.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo()); + } + orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode()); + orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus())); + + // 获取实时消费金额 + List chargingRealTimeData = getChargingRealTimeData(orderListVO.getTransactionCode()); + if (CollectionUtils.isNotEmpty(chargingRealTimeData)) { + RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0); + orderListVO.setRealTimeAmount(new BigDecimal(realTimeMonitorData.getChargingAmount())); + orderListVO.setRealTimeChargingDegree(realTimeMonitorData.getChargingDegree()); } } return orderListVOS; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java index d95363bb6..b065491c0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java @@ -203,4 +203,14 @@ public class OrderListVO { * 服务费金额 */ private BigDecimal totalServiceAmount; + + /** + * 实时消费金额 + */ + private BigDecimal realTimeAmount; + + /** + * 实时充电度数 + */ + private String realTimeChargingDegree; }