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 762beecf8..a9feab347 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 @@ -169,9 +169,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { if (CollectionUtils.isNotEmpty(orderListVOS)) { for (OrderListVO orderListVO : orderListVOS) { // 如果是微信支付,通过订单号查询微信支付单号 - if (StringUtils.equals(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue(), orderListVO.getPayMode())) { + if (StringUtils.equals(PaymentInstitutionsEnum.WECHAT_PAY.getValue(), orderListVO.getPaymentInstitutions())) { WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode()); orderListVO.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo()); + } else { + AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode()); + orderListVO.setOutTradeNo(adapayCallbackRecord.getPaymentId()); } orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode()); orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus())); 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 819a086e1..134a9a3a8 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 @@ -179,4 +179,9 @@ public class OrderListVO { */ @Excel(name = "微信商户单号") private String outTradeNo; + + /** + * 支付机构 + */ + private String paymentInstitutions; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index be650a4d0..e6269c04d 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -178,11 +178,13 @@ t1.charge_start_time as chargeStartTime, t1.charge_end_time as chargeEndTime, t1.create_time as createTime, - t4.total_used_electricity as chargingDegree + t4.total_used_electricity as chargingDegree, + t5.payment_institutions as paymentInstitutions from order_basic_info t1 left join member_basic_info t2 on t1.member_id = t2.member_id join pile_station_info t3 on t1.station_id = t3.id join order_detail t4 on t4.order_code = t1.order_code + join member_transaction_record t5 on t5.order_code = t1.order_code where t1.del_flag = '0' and t1.pile_sn = #{pileSn,jdbcType=VARCHAR}