From c014190d15b41704085d2e96b3fb51d39d8c2016 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 12 Feb 2025 13:39:07 +0800
Subject: [PATCH] refactor(mall): 优化订单商品名称的显示格式
---
src/main/java/cc/mrbird/febs/pay/controller/FiuuReturnController.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/FiuuReturnController.java b/src/main/java/cc/mrbird/febs/pay/controller/FiuuReturnController.java
index c14b75b..7c9e498 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/FiuuReturnController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/FiuuReturnController.java
@@ -8,6 +8,7 @@
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.mapper.MallMoneyFlowMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
+import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -37,6 +38,8 @@
private MallOrderInfoMapper mallOrderInfoMapper;
@Resource
private MallMoneyFlowMapper mallMoneyFlowMapper;
+ @Resource
+ private IApiMallMemberWalletService memberWalletService;
@PostMapping("/payment/callback")
public String handlePaymentCallback(
@@ -92,15 +95,21 @@
MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(new LambdaQueryWrapper<MallMoneyFlow>().eq(MallMoneyFlow::getOrderNo, orderId));
if (mallMoneyFlow != null) {
- // 更新订单状态为已支付
- mallMoneyFlow.setStatus(2);
- mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ if(1 == mallMoneyFlow.getStatus()){
+ memberWalletService.addBalance(mallMoneyFlow.getAmount(),mallMoneyFlow.getMemberId());
+ // 更新订单状态为已支付
+ mallMoneyFlow.setStatus(2);
+ mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ }
+ }else{
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(Long.parseLong(orderId));
+ if(mallOrderInfo != null){
+ if("1" == mallOrderInfo.getPayResult()){
+ return "payment-success";
+ }
+ updateOrderStatus(orderId, status, amount, payDate, tranId);
+ }
}
- MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(Long.parseLong(orderId));
- if(mallOrderInfo != null){
- updateOrderStatus(orderId, status, amount, payDate, tranId);
- }
- // 跳转到支付成功页面
return "payment-success";
}
--
Gitblit v1.9.1