From c8236d20a3f70a8859d55b4bc9505a51cc2aff62 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Thu, 24 Jul 2025 15:28:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=AE=A1=E6=A0=B8--=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9Ebug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/controller/GeneralController.java |  6 ++++++
 .../java/com/example/demo/serviceImpl/AuditServiceImpl.java | 13 ++++++++-----
 src/main/resources/application.yml                          |  2 +-
 src/main/resources/mapper/AuditMapper.xml                   |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/GeneralController.java b/src/main/java/com/example/demo/controller/GeneralController.java
index 947cd4a..b7af0fb 100644
--- a/src/main/java/com/example/demo/controller/GeneralController.java
+++ b/src/main/java/com/example/demo/controller/GeneralController.java
@@ -47,6 +47,12 @@ public class GeneralController {
         List<String> market = generalService.getRoleMarket(roleVo.getId());
         return Result.success(market);
     }
+    //获取全部的角色地区
+    @PostMapping("/allRoleMarket")
+    public Result getAllRoleMarket(){
+        List<String> list = generalService.getAllRoleMarket();
+        return Result.success(list);
+    }
     @PostMapping("/platform")
     public Result getPlatform()
     {
diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
index 910addc..9d8630a 100644
--- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
@@ -17,6 +17,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -44,6 +45,7 @@ public class AuditServiceImpl implements AuditService {
     /*
     审核订单并修改用户余额等
      */
+    @Transactional
     @Override
     public boolean auditOrder(String token, String orderCode, Integer auditId, Integer action,String rejectReason) {
         UserGoldRecord order=auditMapper.selectOrderByOrderCode(orderCode);
@@ -56,11 +58,7 @@ public class AuditServiceImpl implements AuditService {
         updateOrder.setAuditId(auditId);
         //判断是通过还是驳回
         if (action==2){     //驳回
-            updateOrder.setAuditStatus(2);
-            updateOrder.setRejectReason(rejectReason);
-            updateOrder.setAuditTime(new Date());
-            // 执行审核更新
-            auditMapper.updateOrder(updateOrder);
+
             if (order.getType()==2) {  //退款
                 //2.获取对应的消费订单（退款订单号去掉开头"TK"即为对应消费订单）
                 String consumeOrderCode = order.getOrderCode().replaceFirst("TK", "");
@@ -71,6 +69,11 @@ public class AuditServiceImpl implements AuditService {
                 }else {
                     throw new IllegalArgumentException("找不到对应的订单或不是有效订单");
                 }
+                updateOrder.setAuditStatus(2);
+                updateOrder.setRejectReason(rejectReason);
+                updateOrder.setAuditTime(new Date());
+                // 执行审核更新
+                auditMapper.updateOrder(updateOrder);
             }
         }else if (action==1) {    //通过
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 024f557..cf3440a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
   jackson:
     deserialization:
       fail-on-unknown-properties: false
diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml
index b42e648..23778db 100644
--- a/src/main/resources/mapper/AuditMapper.xml
+++ b/src/main/resources/mapper/AuditMapper.xml
@@ -152,7 +152,7 @@
     <!--根据订单号查订单-->
 
     <select id="selectAllOrderByOrderCode" resultType="com.example.demo.domain.entity.UserGoldRecord">
-        select * from user_gold_record where order_code = #{orderCode} and ugr.flag=1
+        select * from user_gold_record  where order_code = #{orderCode} and flag=1
         ORDER BY create_time DESC
             limit 1
     </select>