Merge remote-tracking branch 'origin/milestone-20250727-金币重构三期' into milestone-20250727-金币重构三期

src/main/java/com/example/demo/controller/coin/ConsumeController.java

@@ -90,10 +90,12 @@ public class ConsumeController {
                     HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
                     String token = request.getHeader("token");
                     Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
-                    List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
-
-                    if(!markets.contains("总部")&&!markets.contains("研发部")) {
-                        page.getConsumeUser().setMarkets(markets);
+                    if (admin != null) {
+                        List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                        page.getConsumeUser().setMarkets(list);
+                    }
+                    else{
+                        return Result.error("角色为空");
                     }
                 }
                 return Result.success(consumeService.selectBy(page.getPageNum(), page.getPageSize(), page.getConsumeUser()));
@@ -113,10 +115,12 @@ public class ConsumeController {
                 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
                 String token = request.getHeader("token");
                 Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
-                List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
-
-                if(!markets.contains("1")) {
-                    consumeUser.setMarkets(markets);
+                if (admin != null) {
+                    List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                    consumeUser.setMarkets(list);
+                }
+                else{
+                    return Result.error("角色为空");
                 }
             }
             Gold gold = consumeService.statsGold(consumeUser);

src/main/java/com/example/demo/controller/coin/RechargeController.java

@@ -83,8 +83,8 @@ public class RechargeController {
                     HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
                     String token = request.getHeader("token");
                     Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+                    if (admin != null) {
                         List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));;
-                    if(!markets.contains("总部")&&!markets.contains("研发部")) {
                         page.getRechargeUser().setMarkets(markets);
                     }
                 }
@@ -106,10 +106,8 @@ public class RechargeController {
                 String token = request.getHeader("token");
                 Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
                 List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));;
-                if(!markets.contains("总部")&&!markets.contains("研发部")) {
                 rechargeUser.setMarkets(markets);
             }
-            }
             Gold gold = rechargeService.statsGold(rechargeUser);
             return Result.success(gold);
         } catch (Exception e) {

src/main/java/com/example/demo/controller/coin/RefundController.java

@@ -79,11 +79,8 @@ public class RefundController {
                     String token = request.getHeader("token");
                     Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
                     List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
-
-                    if(!markets.contains("总部")&&!markets.contains("研发部")) {
                     page.getRefundUser().setMarkets(markets);
                 }
-                }
                 return Result.success(refundService.selectBy(page.getPageNum(), page.getPageSize(), page.getRefundUser()));
             }
         } catch (Exception e) {
@@ -102,11 +99,8 @@ public class RefundController {
                 String token = request.getHeader("token");
                 Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
                 List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
-
-                if(!markets.contains("1")) {
                 refundUser.setMarkets(markets);
             }
-            }
             Gold gold = refundService.statsGold(refundUser);
             return Result.success(gold);
         } catch (Exception e) {

src/main/resources/mapper/GoldDetailMapper.xml

@@ -7,11 +7,12 @@
     </insert>
 
     <select id="getGoldDetail" resultType="com.example.demo.domain.vo.coin.GoldDetail">
-        select `user`.name, `user`.jwcode, `user`.market, `ugr`.pay_platform, `ugr`.type, `ugr`.sum_gold, `ugr`.permanent_gold, `ugr`.free_june, `ugr`.free_december, `ugr`.task_gold, `admin`.admin_name, `ugr`.audit_time,
+        select `user`.name, `user`.jwcode, m.name as market, `ugr`.pay_platform, `ugr`.type, `ugr`.sum_gold, `ugr`.permanent_gold, `ugr`.free_june, `ugr`.free_december, `ugr`.task_gold, `admin`.admin_name, `ugr`.audit_time,
         `ugr`.free_june+`ugr`.free_december as free_gold
         from user_gold_record ugr
         left join `user` on `user`.jwcode = `ugr`.jwcode
         left join `admin` on `admin`.id = `ugr`.admin_id
+        left join market m on m.id=`user`.market
         <where>
             ugr.flag = 1 and
              ugr.audit_status IN (1,3)