From 107c4d630c5b5c1b04f0d63a147e363b68dd1e8c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 27 Oct 2023 17:57:53 +0800
Subject: [PATCH] 版本管理
---
src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java | 21 +++++++++++++++------
1 files changed, 15 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..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());
}
}
}
@@ -257,12 +255,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 +282,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