czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
wangw
2025-10-29 17:20:37 +08:00
parent 1e1474659e 2a23d080d0
commit f96f60e9cf
5 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/BaseWx.java
View File

@@ -159,8 +159,6 @@ public abstract class BaseWx {
}
public JSONObject verifySignature(HttpServletRequest request) {
try {
log.info("开始校验签名并解密");
String timestamp = request.getHeader("Wechatpay-Timestamp");

22
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
View File

@@ -671,7 +671,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
JSONObject jsonObject = appWxService.transferBalance(userInfo.getWechatOpenId(), userInfo.getRealName(), finalAmount, "提现", withdrawFlow.getBillNo());
withdrawFlow.setPackageInfo(jsonObject.getString("package_info"));
// 扣减余额
userInfoService.updateDistributionAmount(userId, withdrawFlow.getAmount().negate());
userInfoService.updateDistributionAmount(userId, withdrawFlowDTO.getAmount().negate());
return withdrawFlowService.save(withdrawFlow);
}
@@ -687,4 +687,24 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
"package", flow.getPackageInfo()
);
}
@Override
public void withdrawNotify(String outBillNo, String state) {
MkDistributionWithdrawFlow flow = withdrawFlowService.getOne(new QueryWrapper().eq(MkDistributionWithdrawFlow::getBillNo, outBillNo));
AssertUtil.isNull(flow, "提现记录不存在");
switch (state) {
case "SUCCESS":
flow.setStatus(TableValueConstant.DistributionWithdrawFlow.Status.FINISH.getCode());
break;
case "FAIL":
flow.setStatus(TableValueConstant.DistributionWithdrawFlow.Status.FAIL.getCode());
case "CANCELLED":
flow.setStatus(TableValueConstant.DistributionWithdrawFlow.Status.FAIL.getCode());
// 扣减余额
userInfoService.updateDistributionAmount(flow.getUserId(), flow.getAmount().add(flow.getServiceFee()));
break;
}
withdrawFlowService.updateById(flow);
}
}