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

update 订单详情页 支付方式描述

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-03-25 13:56:39 +08:00
parent 3203d99144
commit 393a60eda5
2 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayRecordEnum.java
View File

@@ -6,8 +6,8 @@ package com.jsowell.common.enums.ykc;
* 后端数据库 * 后端数据库
*/ */
public enum OrderPayRecordEnum { public enum OrderPayRecordEnum {
PRINCIPAL_BALANCE_PAYMENT("1", "本金余额支付"), PRINCIPAL_BALANCE_PAYMENT("1", "本金支付"),
GIFT_BALANCE_PAYMENT("2", "赠送余额支付"), GIFT_BALANCE_PAYMENT("2", "赠金支付"),
WHITELIST_PAYMENT("3", "白名单支付"), WHITELIST_PAYMENT("3", "白名单支付"),
WECHATPAY_PAYMENT("4", "微信支付"), WECHATPAY_PAYMENT("4", "微信支付"),
ALIPAY_PAYMENT("5", "支付宝支付"), ALIPAY_PAYMENT("5", "支付宝支付"),

31
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java
View File

@@ -119,33 +119,18 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService {
|| StringUtils.equals(payMode, OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) { || StringUtils.equals(payMode, OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) {
// 使用余额支付 // 使用余额支付
payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()); payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue());
payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel()); String payModeDesc = null;
if (StringUtils.isNotBlank(OrderPayRecordEnum.getPayModeDescription(payMode))) {
payModeDesc = OrderPayRecordEnum.getPayModeDescription(payMode);
} else {
payModeDesc = OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue();
}
payInfo.setPayModeDesc(payModeDesc);
} else if (StringUtils.equals(payMode, OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue())) { } else if (StringUtils.equals(payMode, OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue())) {
// 使用微信支付 // 使用微信支付
payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue()); payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue());
payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getLabel()); payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getLabel());
// 判断是微信支付还是汇付支付
// MemberTransactionRecord record = memberTransactionRecordService.selectByOrderCode(orderCode, ActionTypeEnum.FORWARD.getValue());
// if (record != null) {
// String paymentInstitutions = record.getPaymentInstitutions();
// if (StringUtils.equals(paymentInstitutions, PaymentInstitutionsEnum.WECHAT_PAY.getValue())) {
// // 查微信支付回调记录
// WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderCode);
// if (wxpayCallbackRecord != null) {
// payInfo.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo());
// payInfo.setTransactionId(wxpayCallbackRecord.getTransactionId());
// }
// } else if (StringUtils.equals(paymentInstitutions, PaymentInstitutionsEnum.ADAPAY.getValue())) {
// // 查询汇付支付回调
// AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderCode);
// if (adapayCallbackRecord != null) {
// payInfo.setOutTradeNo(adapayCallbackRecord.getPaymentId());
// payInfo.setTransactionId(adapayCallbackRecord.getOutTransId());
// }
// }
// }
// 判断是微信支付还是汇付支付 // 判断是微信支付还是汇付支付
String paymentInstitutions = orderPayRecord.getAcquirer(); String paymentInstitutions = orderPayRecord.getAcquirer();
if (StringUtils.equals(paymentInstitutions, PaymentInstitutionsEnum.WECHAT_PAY.getValue())) { if (StringUtils.equals(paymentInstitutions, PaymentInstitutionsEnum.WECHAT_PAY.getValue())) {
@@ -173,7 +158,7 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService {
payRecordList.add(payInfo); payRecordList.add(payInfo);
} }
redisCache.setCacheList(redisKey, payRecordList); redisCache.setCacheList(redisKey, payRecordList);
redisCache.expire(redisKey, CacheConstants.cache_expire_time_10d); redisCache.expire(redisKey, CacheConstants.cache_expire_time_1d);
return payRecordList; return payRecordList;
} }