mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 修复充值没有正确显示充值记录的bug 

fix 微信退款显示v3 错误的bug
This commit is contained in:
damonyuan 2024-11-10 16:26:39 +08:00
parent 942769780e
commit 10d65b7811
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/like-common/src/main/java/com/mdd/common/enums/LogMoneyEnum.java
View File

@ -8,10 +8,10 @@ public enum LogMoneyEnum {
/** /**
* 用户余额类型 * 用户余额类型
*/ */
UM_INC_ADMIN(1001, "平台增加余额"), UM_INC_ADMIN(200, "平台增加余额"),
UM_DEC_ADMIN(1002, "平台减少余额"), UM_DEC_ADMIN(100, "平台减少余额"),
UM_INC_RECHARGE(1003, "充值余额增加"), UM_INC_RECHARGE(201, "充值增加余额"),
UM_DEC_RECHARGE(1004, "充值余额退回"); UM_DEC_RECHARGE(101, "充值订单退款减少余额");
/** /**
* 构造方法 * 构造方法

4
server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java
View File

@ -137,13 +137,13 @@ public class WxPayDriver {
requestObj.setNotifyUrl(request.getNotifyUrl()); requestObj.setNotifyUrl(request.getNotifyUrl());
requestObj.setSubMchid(request.getSubMchid()); requestObj.setSubMchid(request.getSubMchid());
requestObj.setGoodsDetails(request.getGoodsDetails()); requestObj.setGoodsDetails(request.getGoodsDetails());
WxPayRefundV3Request.Amount amount = new WxPayRefundV3Request.Amount(); WxPayRefundV3Request.Amount amount = new WxPayRefundV3Request.Amount();
amount.setRefund(request.getRefundAmount()); amount.setRefund(request.getRefundAmount());
amount.setTotal(request.getTotalAmount()); amount.setTotal(request.getTotalAmount());
amount.setCurrency(StringUtils.isEmpty(request.getCurrency()) ? "CNY" : request.getCurrency()); amount.setCurrency(StringUtils.isEmpty(request.getCurrency()) ? "CNY" : request.getCurrency());
requestObj.setAmount(amount); requestObj.setAmount(amount);
WxPayService wxPayService = WxPayDriver.handler(4);
return wxPayService.refundV3(requestObj); return wxPayService.refundV3(requestObj);
} }
@ -176,7 +176,6 @@ public class WxPayDriver {
.last("limit 1")); .last("limit 1"));
String scene = type.equals("oa") ? "oa_setting" : "mnp_setting"; String scene = type.equals("oa") ? "oa_setting" : "mnp_setting";
String appId = ConfigUtils.get(scene, "app_id", ""); String appId = ConfigUtils.get(scene, "app_id", "");
Map<String, String> params = MapUtils.jsonToMap(config.getConfig().toString()); Map<String, String> params = MapUtils.jsonToMap(config.getConfig().toString());
String mchId = params.get("mch_id"); String mchId = params.get("mch_id");
String paySignKey = params.get("pay_sign_key"); String paySignKey = params.get("pay_sign_key");
@ -190,7 +189,6 @@ public class WxPayDriver {
payConfig.setPrivateKeyContent(privateKey); payConfig.setPrivateKeyContent(privateKey);
payConfig.setPrivateCertContent(privateCert); payConfig.setPrivateCertContent(privateCert);
payConfig.setUseSandboxEnv(false); payConfig.setUseSandboxEnv(false);
if (!type.equals("oa")) { if (!type.equals("oa")) {
wxPayMnpService.setConfig(payConfig); wxPayMnpService.setConfig(payConfig);
} else { } else {

8
server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
View File

@ -15,10 +15,7 @@ import com.mdd.common.entity.setting.DevPayConfig;
import com.mdd.common.entity.setting.DevPayWay; import com.mdd.common.entity.setting.DevPayWay;
import com.mdd.common.entity.user.User; import com.mdd.common.entity.user.User;
import com.mdd.common.entity.user.UserAuth; import com.mdd.common.entity.user.UserAuth;
import com.mdd.common.enums.ClientEnum; import com.mdd.common.enums.*;
import com.mdd.common.enums.LogMoneyEnum;
import com.mdd.common.enums.PaymentEnum;
import com.mdd.common.enums.YesNoEnum;
import com.mdd.common.exception.OperateException; import com.mdd.common.exception.OperateException;
import com.mdd.common.exception.PaymentException; import com.mdd.common.exception.PaymentException;
import com.mdd.common.mapper.log.UserAccountLogMapper; import com.mdd.common.mapper.log.UserAccountLogMapper;
@ -368,12 +365,11 @@ public class PayServiceImpl implements IPayService {
userMapper.updateById(user); userMapper.updateById(user);
logMoneyMapper.add(rechargeOrder.getUserId(), logMoneyMapper.add(rechargeOrder.getUserId(),
LogMoneyEnum.UM_INC_RECHARGE.getCode(), AccountLogEnum.UM_INC_RECHARGE.getCode(),
rechargeOrder.getOrderAmount(), rechargeOrder.getOrderAmount(),
rechargeOrder.getId(), rechargeOrder.getId(),
rechargeOrder.getSn(), rechargeOrder.getSn(),
"用户充值余额", null); "用户充值余额", null);
} }
} }
} }