From 6576fbb2d26c88710353e114cdc003b347a9b8c0 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 12 Jul 2023 16:50:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AdapayMemberAccountServiceImpl.java | 4 ++-- .../pile/service/impl/OrderBasicInfoServiceImpl.java | 8 ++++++++ .../java/com/jsowell/pile/vo/web/OrderListVO.java | 11 +++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) 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 c36d60ff0..fc19c18b2 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 @@ -205,6 +205,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } 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.setRealTimeSoc(realTimeMonitorData.getSOC()); + } } } 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..8f3451906 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 @@ -135,6 +135,11 @@ public class OrderListVO { @Excel(name = "终止soc", suffix = "%") private String endSoc; + /** + * 实时SOC + */ + private String realTimeSoc; + /** * 开始充电时间 */ @@ -203,4 +208,10 @@ public class OrderListVO { * 服务费金额 */ private BigDecimal totalServiceAmount; + + /** + * 实时消费金额 + */ + private BigDecimal realTimeAmount; + } From a149fb2366fbb8dbd5e31f753df8dd0f785a73b7 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 12 Jul 2023 16:54:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/OrderBasicInfoServiceImpl.java | 2 +- .../main/java/com/jsowell/pile/vo/web/OrderListVO.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) 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 fc19c18b2..89d278788 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 @@ -211,7 +211,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { if (CollectionUtils.isNotEmpty(chargingRealTimeData)) { RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0); orderListVO.setRealTimeAmount(new BigDecimal(realTimeMonitorData.getChargingAmount())); - orderListVO.setRealTimeSoc(realTimeMonitorData.getSOC()); + orderListVO.setRealTimeChargingDegree(realTimeMonitorData.getChargingDegree()); } } } 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 8f3451906..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 @@ -135,11 +135,6 @@ public class OrderListVO { @Excel(name = "终止soc", suffix = "%") private String endSoc; - /** - * 实时SOC - */ - private String realTimeSoc; - /** * 开始充电时间 */ @@ -214,4 +209,8 @@ public class OrderListVO { */ private BigDecimal realTimeAmount; + /** + * 实时充电度数 + */ + private String realTimeChargingDegree; } From e0ebbed4d2adb1d2f6382f324b702690e6e67753 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 13 Jul 2023 09:18:30 +0800 Subject: [PATCH 3/3] update --- .../impl/OrderBasicInfoServiceImpl.java | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) 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 89d278788..4ffc449fb 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,27 +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()); - } + // 获取实时消费金额 + 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;