autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-14 20:30:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-13 09:18:30 +08:00
parent a149fb2366
commit e0ebbed4d2
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -192,27 +192,28 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
dto.setStationDeptIds(authorizedMap.getStationDeptIds()); dto.setStationDeptIds(authorizedMap.getStationDeptIds());
dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds()); dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds());
List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto); List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto);
if (CollectionUtils.isNotEmpty(orderListVOS)) { if (CollectionUtils.isEmpty(orderListVOS)) {
for (OrderListVO orderListVO : orderListVOS) { return orderListVOS;
// 如果是微信支付，通过订单号查询微信支付单号 }
// logger.info("如果是微信支付，通过订单号查询微信支付单号 orderListVO:{}", JSON.toJSONString(orderListVO)); for (OrderListVO orderListVO : orderListVOS) {
if (StringUtils.equals(PaymentInstitutionsEnum.ADAPAY.getValue(), orderListVO.getPaymentInstitutions())) { // 如果是微信支付，通过订单号查询微信支付单号
AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode()); // logger.info("如果是微信支付，通过订单号查询微信支付单号 orderListVO:{}", JSON.toJSONString(orderListVO));
orderListVO.setOutTradeNo(adapayCallbackRecord.getPaymentId()); if (StringUtils.equals(PaymentInstitutionsEnum.ADAPAY.getValue(), orderListVO.getPaymentInstitutions())) {
} else if (StringUtils.equals(PaymentInstitutionsEnum.WECHAT_PAY.getValue(), orderListVO.getPaymentInstitutions())) { AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode());
WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode()); orderListVO.setOutTradeNo(adapayCallbackRecord.getPaymentId());
orderListVO.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo()); } else if (StringUtils.equals(PaymentInstitutionsEnum.WECHAT_PAY.getValue(), orderListVO.getPaymentInstitutions())) {
} WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode());
orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode()); orderListVO.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo());
orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus())); }
orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode());
orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus()));
// 获取实时消费金额 // 获取实时消费金额
List<RealTimeMonitorData> chargingRealTimeData = getChargingRealTimeData(orderListVO.getTransactionCode()); List<RealTimeMonitorData> chargingRealTimeData = getChargingRealTimeData(orderListVO.getTransactionCode());
if (CollectionUtils.isNotEmpty(chargingRealTimeData)) { if (CollectionUtils.isNotEmpty(chargingRealTimeData)) {
RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0); RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0);
orderListVO.setRealTimeAmount(new BigDecimal(realTimeMonitorData.getChargingAmount())); orderListVO.setRealTimeAmount(new BigDecimal(realTimeMonitorData.getChargingAmount()));
orderListVO.setRealTimeChargingDegree(realTimeMonitorData.getChargingDegree()); orderListVO.setRealTimeChargingDegree(realTimeMonitorData.getChargingDegree());
}
} }
} }
return orderListVOS; return orderListVOS;