From 06f8705b2bbd38aca2cb01e23bc28c5db26d7a7a Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 08 May 2023 22:41:27 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 4a10555..1cc4d76 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));
@@ -117,7 +119,7 @@
if (score.compareTo(BigDecimal.ZERO) > 0) {
memberWalletService.add(score, orderInfo.getMemberId(), "score");
- mallMoneyFlowService.addMoneyFlow(orderInfo.getMemberId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+// mallMoneyFlowService.addMoneyFlow(orderInfo.getMemberId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
// 添加业绩
mallAchieveService.add(orderItem.getId());
@@ -129,7 +131,7 @@
MallMember mallMember = memberMapper.selectById(orderInfo.getMemberId());
if (hasTc) {
if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
- mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+ mallMember.setLevel(AgentLevelEnum.SECOND_LEVEL.name());
memberMapper.updateById(mallMember);
}
}
@@ -230,7 +232,7 @@
if (score.compareTo(BigDecimal.ZERO) > 0) {
memberWalletService.add(score, orderInfo.getMemberId(), "score");
- mallMoneyFlowService.addMoneyFlow(orderInfo.getMemberId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+// mallMoneyFlowService.addMoneyFlow(orderInfo.getMemberId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
// 添加业绩
mallAchieveService.add(orderItem.getId());
@@ -242,7 +244,7 @@
MallMember mallMember = memberMapper.selectById(orderInfo.getMemberId());
if (hasTc) {
if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
- mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+ mallMember.setLevel(AgentLevelEnum.SECOND_LEVEL.name());
memberMapper.updateById(mallMember);
}
}
@@ -257,12 +259,13 @@
}
@PostMapping(value = "/singlePayCallBack")
- public SinglePayCallBackVo singlePayCallBack(@RequestBody SinglePayCallBackDto singlePayCallBackDto){
+ public JSONObject singlePayCallBack(@RequestBody SinglePayCallBackDto singlePayCallBackDto){
log.info("进入汇聚支付代付回调"+ JSONUtil.parseObj(singlePayCallBackDto));
String status = singlePayCallBackDto.getStatus();
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,11 +286,21 @@
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();
singlePayCallBackVo.setStatusCode("2001");
singlePayCallBackVo.setMessage("成功");
- return singlePayCallBackVo;
+ JSONObject jsonObject = JSONUtil.parseObj(singlePayCallBackVo);
+ return jsonObject;
}
}
--
Gitblit v1.9.1