From 393a60eda51227ed576e8a2a7d1914be3a0f5a10 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 25 Mar 2024 13:56:39 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=20=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/ykc/OrderPayRecordEnum.java | 4 +-- .../impl/OrderPayRecordServiceImpl.java | 31 +++++-------------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayRecordEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayRecordEnum.java index b15b61afc..654a7298f 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayRecordEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayRecordEnum.java @@ -6,8 +6,8 @@ package com.jsowell.common.enums.ykc; * 后端数据库 */ public enum OrderPayRecordEnum { - PRINCIPAL_BALANCE_PAYMENT("1", "本金余额支付"), - GIFT_BALANCE_PAYMENT("2", "赠送余额支付"), + PRINCIPAL_BALANCE_PAYMENT("1", "本金支付"), + GIFT_BALANCE_PAYMENT("2", "赠金支付"), WHITELIST_PAYMENT("3", "白名单支付"), WECHATPAY_PAYMENT("4", "微信支付"), ALIPAY_PAYMENT("5", "支付宝支付"), diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java index b42f5ff48..39fd0c8a9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java @@ -119,33 +119,18 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService { || StringUtils.equals(payMode, OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.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())) { // 使用微信支付 payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue()); 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(); if (StringUtils.equals(paymentInstitutions, PaymentInstitutionsEnum.WECHAT_PAY.getValue())) { @@ -173,7 +158,7 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService { payRecordList.add(payInfo); } redisCache.setCacheList(redisKey, payRecordList); - redisCache.expire(redisKey, CacheConstants.cache_expire_time_10d); + redisCache.expire(redisKey, CacheConstants.cache_expire_time_1d); return payRecordList; }