From bd3534a71605afea33ba7a3e58dc0bbd97ce0b1d Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Mon, 21 Jul 2025 20:14:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=87=E5=9C=B0=E5=8C=BA=E8=B5=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/domain/vo/GoldUser.java  |  3 +-
 .../java/com/example/demo/mapper/UserMapper.java   |  3 +-
 .../example/demo/serviceImpl/UserServiceImpl.java  | 10 +++-
 src/main/resources/mapper/UserMapper.xml           | 65 +++++++++++++++++-----
 4 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/GoldUser.java b/src/main/java/com/example/demo/domain/vo/GoldUser.java
index 1971d53..5185e7d 100644
--- a/src/main/java/com/example/demo/domain/vo/GoldUser.java
+++ b/src/main/java/com/example/demo/domain/vo/GoldUser.java
@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @program: gold-java
@@ -54,5 +55,5 @@ public class GoldUser {
     @ExcelProperty("首充日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
     private Date firstRecharge; // 首充日期
-
+    private List<String> markets; // 地区列表
 }
diff --git a/src/main/java/com/example/demo/mapper/UserMapper.java b/src/main/java/com/example/demo/mapper/UserMapper.java
index f137af5..b6bb6bc 100644
--- a/src/main/java/com/example/demo/mapper/UserMapper.java
+++ b/src/main/java/com/example/demo/mapper/UserMapper.java
@@ -24,7 +24,8 @@ public interface UserMapper {
 
     //获取用户金币信息
     GoldUser selectUser(String jwcode);
-
+    //获取用户金币信息
+    GoldUser selectUserCard(@Param("jwcode")String jwcode,@Param("markets")List<String> markets);
     //获取金币数
     GoldUser selectGold(String jwcode);
 
diff --git a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
index a5646ad..f473e2f 100644
--- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
@@ -5,6 +5,8 @@ import com.example.demo.domain.vo.Gold;
 import com.example.demo.domain.vo.GoldUser;
 import com.example.demo.mapper.ConsumeMapper;
 import com.example.demo.mapper.UserMapper;
+import com.example.demo.service.AdminService;
+import com.example.demo.service.GeneralService;
 import com.example.demo.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -28,11 +30,17 @@ public class UserServiceImpl implements UserService {
 
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private AdminService adminService;
+    @Autowired
+    private GeneralService generalService;
 
     //查找用户部分信息
     @Override
     public GoldUser selectUser(String jwcode) {
-        GoldUser user = userMapper.selectUser(jwcode);
+        String account = adminService.getCurrentAdminAccount();
+        List<String> markets = generalService.getAdminMarket(account);
+        GoldUser user = userMapper.selectUserCard(jwcode,markets);
         return user;
     }
 
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 7e2f32c..d880b1e 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -14,22 +14,57 @@
     <!-- 根据精网号查询用户信息 -->
     <select id="selectUser" resultType="com.example.demo.domain.vo.GoldUser">
         SELECT
-            name AS "name",
-            jwcode AS "jwcode",
-            market AS "market",
-            (COALESCE(current_permanent_gold, 0) + COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0) + COALESCE(current_task_gold, 0)) AS "nowSumGold",
-            current_permanent_gold AS "nowPermanentGold",
-            (COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0)) AS "nowFreeGold",
-            current_task_gold AS "nowTaskGold",
-            (COALESCE(sum_permanent_gold, 0) + COALESCE(sum_free_june, 0) + COALESCE(sum_free_december, 0) + COALESCE(sum_task_gold, 0)) AS "historySumGold",
-            sum_permanent_gold AS "historyPermanentGold",
-            (COALESCE(sum_free_june, 0) + COALESCE(sum_free_december, 0)) AS "historyFreeGold",
-            sum_task_gold AS "historyTaskGold",
-            recharge_num AS "rechargeNum",
-            consume_num AS "consumeNum",
-            first_recharge AS "firstRecharge"
+        name AS "name",
+        jwcode AS "jwcode",
+        market AS "market",
+        (COALESCE(current_permanent_gold, 0) + COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0) +
+        COALESCE(current_task_gold, 0)) AS "nowSumGold",
+        current_permanent_gold AS "nowPermanentGold",
+        (COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0)) AS "nowFreeGold",
+        current_task_gold AS "nowTaskGold",
+        (COALESCE(sum_permanent_gold, 0) + COALESCE(sum_free_june, 0) + COALESCE(sum_free_december, 0) +
+        COALESCE(sum_task_gold, 0)) AS "historySumGold",
+        sum_permanent_gold AS "historyPermanentGold",
+        (COALESCE(sum_free_june, 0) + COALESCE(sum_free_december, 0)) AS "historyFreeGold",
+        sum_task_gold AS "historyTaskGold",
+        recharge_num AS "rechargeNum",
+        consume_num AS "consumeNum",
+        first_recharge AS "firstRecharge"
         FROM user
-        WHERE jwcode = #{jwcode}
+        <where>
+            jwcode = #{jwcode}
+        </where>
+    </select>
+
+    <!-- 根据精网号查询用户信息 -->
+    <select id="selectUserCard" resultType="com.example.demo.domain.vo.GoldUser">
+    SELECT
+    name AS "name",
+    jwcode AS "jwcode",
+    market AS "market",
+    (COALESCE(current_permanent_gold, 0) + COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0) + COALESCE(current_task_gold, 0)) AS "nowSumGold",
+    current_permanent_gold AS "nowPermanentGold",
+    (COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0)) AS "nowFreeGold",
+    current_task_gold AS "nowTaskGold",
+    (COALESCE(sum_permanent_gold, 0) + COALESCE(sum_free_june, 0) + COALESCE(sum_free_december, 0) + COALESCE(sum_task_gold, 0)) AS "historySumGold",
+    sum_permanent_gold AS "historyPermanentGold",
+    (COALESCE(sum_free_june, 0) + COALESCE(sum_free_december, 0)) AS "historyFreeGold",
+    sum_task_gold AS "historyTaskGold",
+    recharge_num AS "rechargeNum",
+    consume_num AS "consumeNum",
+    first_recharge AS "firstRecharge"
+    FROM user
+    <where>
+        jwcode = #{jwcode}
+        <!-- 判断 market 是否不为总部且 markets 不为空 -->
+        <if test="markets != null and markets.size() > 0 and '总部' not in markets">
+            AND (
+            <foreach collection="markets" item="market" open="" close="" separator=" OR ">
+                market LIKE CONCAT('%', #{market}, '%')
+            </foreach>
+            )
+        </if>
+    </where>
     </select>
     <!-- 根据精网号查询用户信息 -->
     <select id="selectAllUser" resultType="com.example.demo.domain.entity.User">