From bad4cadc4c4bc735e97247918a0555bfc1278798 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 24 Oct 2023 17:19:08 +0800
Subject: [PATCH] 版本管理
---
src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
index 1ec07bc..49a2210 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
@@ -78,6 +78,8 @@
@Autowired
private MallMoneyFlowMapper mallMoneyFlowMapper;
+ private final IApiMallMemberWalletService iApiMallMemberWalletService;
+
@GetMapping(value = "/unipayCallBack")
public String unipayCallBack(HttpServletRequest request, UniPayCallBackDto uniPayCallBackDto){
log.info("进入汇聚支付聚合支付回调"+ JSONUtil.parseObj(uniPayCallBackDto));
@@ -135,8 +137,6 @@
}
mallMoneyFlowService.addMoneyFlow(mallMember.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
- agentProducer.sendAutoLevelUpMsg(mallMember.getId());
- agentProducer.sendOrderReturn(orderInfo.getId());
}
}
}
@@ -248,8 +248,6 @@
}
mallMoneyFlowService.addMoneyFlow(mallMember.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
- agentProducer.sendAutoLevelUpMsg(mallMember.getId());
- agentProducer.sendOrderReturn(orderInfo.getId());
}
}
}
@@ -263,6 +261,7 @@
BigDecimal paidAmount = singlePayCallBackDto.getPaidAmount();
BigDecimal paidAmountFee = singlePayCallBackDto.getFee();
String errorCode = singlePayCallBackDto.getErrorCode();
+ String errorCodeDesc = singlePayCallBackDto.getErrorCodeDesc();
String merchantOrderNo = singlePayCallBackDto.getMerchantOrderNo();
log.info("进入汇聚支付代付回调"+status+";"+paidAmount+";"+paidAmountFee+";");
@@ -283,6 +282,14 @@
mallMoneyFlowMapper.updateById(mallMoneyFlow);
}
}
+ }else{
+ QueryWrapper<MallMemberWithdraw> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("withdraw_no",merchantOrderNo);
+ MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectOne(objectQueryWrapper);
+ if(ObjectUtil.isNotEmpty(mallMemberWithdraw)){
+ mallMemberWithdraw.setRemark(errorCodeDesc);
+ mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
+ }
}
SinglePayCallBackVo singlePayCallBackVo = new SinglePayCallBackVo();
--
Gitblit v1.9.1