From 10d65b7811921825b29e10d07fe5be45893337fd Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Sun, 10 Nov 2024 16:26:39 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E5=85=85=E5=80=BC?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA=E5=85=85?= =?UTF-8?q?=E5=80=BC=E8=AE=B0=E5=BD=95=E7=9A=84bug=20fix=20=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E9=80=80=E6=AC=BE=E6=98=BE=E7=A4=BAv3=20=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mdd/common/enums/LogMoneyEnum.java | 8 ++++---- .../java/com/mdd/common/plugin/wechat/WxPayDriver.java | 4 +--- .../java/com/mdd/front/service/impl/PayServiceImpl.java | 8 ++------ 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/server/like-common/src/main/java/com/mdd/common/enums/LogMoneyEnum.java b/server/like-common/src/main/java/com/mdd/common/enums/LogMoneyEnum.java index ae891585..a5154af2 100644 --- a/server/like-common/src/main/java/com/mdd/common/enums/LogMoneyEnum.java +++ b/server/like-common/src/main/java/com/mdd/common/enums/LogMoneyEnum.java @@ -8,10 +8,10 @@ public enum LogMoneyEnum { /** * 用户余额类型 */ - UM_INC_ADMIN(1001, "平台增加余额"), - UM_DEC_ADMIN(1002, "平台减少余额"), - UM_INC_RECHARGE(1003, "充值余额增加"), - UM_DEC_RECHARGE(1004, "充值余额退回"); + UM_INC_ADMIN(200, "平台增加余额"), + UM_DEC_ADMIN(100, "平台减少余额"), + UM_INC_RECHARGE(201, "充值增加余额"), + UM_DEC_RECHARGE(101, "充值订单退款减少余额"); /** * 构造方法 diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java b/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java index d31d96b3..b24e830e 100644 --- a/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java +++ b/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java @@ -137,13 +137,13 @@ public class WxPayDriver { requestObj.setNotifyUrl(request.getNotifyUrl()); requestObj.setSubMchid(request.getSubMchid()); requestObj.setGoodsDetails(request.getGoodsDetails()); - WxPayRefundV3Request.Amount amount = new WxPayRefundV3Request.Amount(); amount.setRefund(request.getRefundAmount()); amount.setTotal(request.getTotalAmount()); amount.setCurrency(StringUtils.isEmpty(request.getCurrency()) ? "CNY" : request.getCurrency()); requestObj.setAmount(amount); + WxPayService wxPayService = WxPayDriver.handler(4); return wxPayService.refundV3(requestObj); } @@ -176,7 +176,6 @@ public class WxPayDriver { .last("limit 1")); String scene = type.equals("oa") ? "oa_setting" : "mnp_setting"; String appId = ConfigUtils.get(scene, "app_id", ""); - Map params = MapUtils.jsonToMap(config.getConfig().toString()); String mchId = params.get("mch_id"); String paySignKey = params.get("pay_sign_key"); @@ -190,7 +189,6 @@ public class WxPayDriver { payConfig.setPrivateKeyContent(privateKey); payConfig.setPrivateCertContent(privateCert); payConfig.setUseSandboxEnv(false); - if (!type.equals("oa")) { wxPayMnpService.setConfig(payConfig); } else { diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java index abc35c20..fa7ec63b 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java @@ -15,10 +15,7 @@ import com.mdd.common.entity.setting.DevPayConfig; import com.mdd.common.entity.setting.DevPayWay; import com.mdd.common.entity.user.User; import com.mdd.common.entity.user.UserAuth; -import com.mdd.common.enums.ClientEnum; -import com.mdd.common.enums.LogMoneyEnum; -import com.mdd.common.enums.PaymentEnum; -import com.mdd.common.enums.YesNoEnum; +import com.mdd.common.enums.*; import com.mdd.common.exception.OperateException; import com.mdd.common.exception.PaymentException; import com.mdd.common.mapper.log.UserAccountLogMapper; @@ -368,12 +365,11 @@ public class PayServiceImpl implements IPayService { userMapper.updateById(user); logMoneyMapper.add(rechargeOrder.getUserId(), - LogMoneyEnum.UM_INC_RECHARGE.getCode(), + AccountLogEnum.UM_INC_RECHARGE.getCode(), rechargeOrder.getOrderAmount(), rechargeOrder.getId(), rechargeOrder.getSn(), "用户充值余额", null); } } - }