autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-18 00:38:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 汇付支付 支付回调

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-05-30 15:37:15 +08:00
parent 9b6a704370
commit de777015f0
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,9 +169,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
if (CollectionUtils.isNotEmpty(orderListVOS)) { if (CollectionUtils.isNotEmpty(orderListVOS)) {
for (OrderListVO orderListVO : 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()); WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode());
orderListVO.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo()); orderListVO.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo());
} else {
AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode());
orderListVO.setOutTradeNo(adapayCallbackRecord.getPaymentId());
} }
orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode()); orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode());
orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus())); orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus()));

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

@@ -179,4 +179,9 @@ public class OrderListVO {
*/ */
@Excel(name = "微信商户单号") @Excel(name = "微信商户单号")
private String outTradeNo; private String outTradeNo;
/**
* 支付机构
*/
private String paymentInstitutions;
} }

4
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -178,11 +178,13 @@
t1.charge_start_time as chargeStartTime, t1.charge_start_time as chargeStartTime,
t1.charge_end_time as chargeEndTime, t1.charge_end_time as chargeEndTime,
t1.create_time as createTime, 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 from order_basic_info t1
left join member_basic_info t2 on t1.member_id = t2.member_id 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 pile_station_info t3 on t1.station_id = t3.id
join order_detail t4 on t4.order_code = t1.order_code 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' where t1.del_flag = '0'
<if test="pileSn != null and pileSn != ''"> <if test="pileSn != null and pileSn != ''">
and t1.pile_sn = #{pileSn,jdbcType=VARCHAR} and t1.pile_sn = #{pileSn,jdbcType=VARCHAR}