From 48d3f1b77adea0609bb2453c7b4a660f2222871f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 25 八月 2025 08:54:50 +0800
Subject: [PATCH] bug修改

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
index e028f8b..0a93f7b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
@@ -17,6 +17,7 @@
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.order.dto.GetImportOrderDTO;
 import com.ruoyi.order.mapper.ChargeOrderMapper;
 import com.ruoyi.order.mapper.OrderMapper;
@@ -313,7 +314,7 @@
             throw new ServiceException(e.getMessage());
         }
         if(!result.isEmpty()){
-            return R.ok(result);
+            return R.fail(result);
         }
         return R.ok();
     }
@@ -384,6 +385,9 @@
                 sysUserClient.updateSysUser(sysUser);
             }
         }
+        //保存到数据库
+        chargeOrder.setPoint(point);
+        chargeOrderService.save(chargeOrder);
         //添加用户积分流水
         //转入用户
         UserPoint userPoint = new UserPoint();
@@ -398,9 +402,7 @@
         if (r.isError(r)) {
             return R.fail("导入订单-保存用户积分流水失败");
         }
-        //保存到数据库
-        chargeOrder.setPoint(point);
-        chargeOrderService.save(chargeOrder);
+
 
         return R.ok();
     }

--
Gitblit v1.7.1