From 70b65a25b5792b6277fa6ce61df61a7399c2dcfc Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 12 Feb 2025 11:25:16 +0800
Subject: [PATCH] fix(mall): 修改获取字典数据的类型和代码

---
 src/main/java/cc/mrbird/febs/pay/controller/FiuuReturnController.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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 17ef880..7c9e498 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/FiuuReturnController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/FiuuReturnController.java
@@ -95,14 +95,18 @@
 
         MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(new LambdaQueryWrapper<MallMoneyFlow>().eq(MallMoneyFlow::getOrderNo, orderId));
         if (mallMoneyFlow != null) {
-            // 更新订单状态为已支付
-            mallMoneyFlow.setStatus(2);
-            mallMoneyFlowMapper.updateById(mallMoneyFlow);
-
-            memberWalletService.addBalance(mallMoneyFlow.getAmount(),mallMoneyFlow.getMemberId());
+            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);
             }
         }

--
Gitblit v1.9.1