autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-03 21:48:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-07-13 11:16:41 +08:00
parent f4d2f67438 e0ebbed4d2
commit 0c4689f3e6
3 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java
View File

@@ -68,9 +68,9 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
} }
/** /**
* 修改【请填写功能名称】 * 修改
* *
* @param adapayMemberAccount 【请填写功能名称】 * @param adapayMemberAccount
* @return 结果 * @return 结果
*/ */
@Override @Override

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

@@ -192,19 +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());
if (CollectionUtils.isNotEmpty(chargingRealTimeData)) {
RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0);
orderListVO.setRealTimeAmount(new BigDecimal(realTimeMonitorData.getChargingAmount()));
orderListVO.setRealTimeChargingDegree(realTimeMonitorData.getChargingDegree());
} }
} }
return orderListVOS; return orderListVOS;

10
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java
View File

@@ -203,4 +203,14 @@ public class OrderListVO {
* 服务费金额 * 服务费金额
*/ */
private BigDecimal totalServiceAmount; private BigDecimal totalServiceAmount;
/**
* 实时消费金额
*/
private BigDecimal realTimeAmount;
/**
* 实时充电度数
*/
private String realTimeChargingDegree;
} }