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

This commit is contained in:
wangw 2025-10-29 18:25:02 +08:00
parent 6709965e28 2f5053ebeb
commit 656ef5165b
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
View File

@ -80,8 +80,9 @@ public class NotifyController {
log.info("参数信息: {}", jsonObject.toJSONString()); log.info("参数信息: {}", jsonObject.toJSONString());
String outBillNo = jsonObject.getString("out_bill_no"); String outBillNo = jsonObject.getString("out_bill_no");
String state = jsonObject.getString("state"); String state = jsonObject.getString("state");
String failReason = jsonObject.getString("fail_reason");
try { try {
distributionUserService.withdrawNotify(outBillNo, state); distributionUserService.withdrawNotify(outBillNo, state, failReason);
}catch (Exception e) { }catch (Exception e) {
log.warn("转账回调失败", e); log.warn("转账回调失败", e);
} }

2
cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionWithdrawFlow.java
View File

@ -80,6 +80,8 @@ public class MkDistributionWithdrawFlow implements Serializable {
private String status; private String status;
private String failReason;
} }

2
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java
View File

@ -144,5 +144,5 @@ public interface MkDistributionUserService extends IService<MkDistributionUser>
* CANCELING： 撤销中 * CANCELING： 撤销中
* CANCELLED： 已撤销 * CANCELLED： 已撤销
*/ */
void withdrawNotify(String outBillNo, String state); void withdrawNotify(String outBillNo, String state, String failReason);
} }

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

@ -693,7 +693,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void withdrawNotify(String outBillNo, String state) { public void withdrawNotify(String outBillNo, String state, String failReason) {
MkDistributionWithdrawFlow flow = withdrawFlowService.getOne(new QueryWrapper().eq(MkDistributionWithdrawFlow::getBillNo, outBillNo)); MkDistributionWithdrawFlow flow = withdrawFlowService.getOne(new QueryWrapper().eq(MkDistributionWithdrawFlow::getBillNo, outBillNo));
AssertUtil.isNull(flow, "提现记录不存在"); AssertUtil.isNull(flow, "提现记录不存在");
switch (state) { switch (state) {
@ -709,6 +709,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
break; break;
} }
flow.setFailReason(failReason);
withdrawFlowService.updateById(flow); withdrawFlowService.updateById(flow);
} }
} }