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

src/main/java/com/example/demo/mapper/coin/MarketMapper.java

@@ -6,4 +6,7 @@ import java.util.List;
 
 public interface MarketMapper {
     List<Market> getMarket();
+
+    //获取市场id
+    List<String> getMarketIds(List<String> list);
 }

src/main/java/com/example/demo/service/coin/MarketService.java

@@ -14,4 +14,7 @@ import java.util.List;
  **/
 public interface MarketService {
     List<Market> selectMarket();
+
+    //获取市场id
+    List<String> getMarketIds(List<String> list);
 }

src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java

@@ -10,6 +10,7 @@ import com.example.demo.domain.vo.coin.Result;
 import com.example.demo.mapper.coin.ConsumeMapper;
 import com.example.demo.mapper.coin.UserMapper;
 import com.example.demo.service.coin.ConsumeService;
+import com.example.demo.service.coin.MarketService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,10 +42,15 @@ public class ConsumeServiceImpl implements ConsumeService {
     @Autowired
     private UserMapper userMapper;
 
+    @Autowired
+    private MarketService marketService;
 
     //消耗明细
     @Override
     public PageInfo<ConsumeUser> selectAll(Integer pageNum, Integer pageSize, ConsumeUser consumeUser){
+        //获取市场id
+        List<String> markets = marketService.getMarketIds(consumeUser.getMarkets());
+        consumeUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<ConsumeUser> consumeUsers = consumeMapper.selectAll(consumeUser);
         return new PageInfo<>(consumeUsers);
@@ -53,6 +59,9 @@ public class ConsumeServiceImpl implements ConsumeService {
     //消耗金币统计
     @Override
     public Gold statsGold(ConsumeUser consumeUser) {
+        //获取市场id
+        List<String> markets = marketService.getMarketIds(consumeUser.getMarkets());
+        consumeUser.setMarkets(markets);
         Gold gold = new Gold();
         List<ConsumeUser> consumeUsers = consumeMapper.selectBy(consumeUser);
 
@@ -88,6 +97,9 @@ public class ConsumeServiceImpl implements ConsumeService {
     //消耗明细筛选
     @Override
     public PageInfo<ConsumeUser> selectBy(Integer pageNum, Integer pageSize, ConsumeUser consumeUser) {
+        //获取市场id
+        List<String> markets = marketService.getMarketIds(consumeUser.getMarkets());
+        consumeUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<ConsumeUser> consumeUsers = consumeMapper.selectBy(consumeUser);
         return new PageInfo<>(consumeUsers);

src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java

@@ -15,6 +15,7 @@ import java.util.stream.Collectors;
 public class MarketServiceImpl implements MarketService {
     @Autowired
     private MarketMapper marketMapper;
+
     @Override
     public List<Market> selectMarket() {
         List<Market> markets = marketMapper.getMarket();
@@ -22,10 +23,11 @@ public class MarketServiceImpl implements MarketService {
         // 2. 构建树形结构（根节点parentId=1）
         return buildTree(markets, -1);
     }
+
     private List<Market> buildTree(List<Market> markets, Integer parentId) {
         // 过滤出当前父节点的子菜单
         List<Market> children = markets.stream()
-                .filter(menu ->  Objects.equals(menu.getParentId(), parentId))
+                .filter(menu -> Objects.equals(menu.getParentId(), parentId))
                 .collect(Collectors.toList());
         // 过滤出当前父节点的子菜单，同时过滤掉id为9的权限
 //        List<MenuVo> children = allMenus.stream()
@@ -39,4 +41,10 @@ public class MarketServiceImpl implements MarketService {
 
         return children;
     }
+
+    @Override
+    public List<String> getMarketIds(List<String> list) {
+        return marketMapper.getMarketIds(list);
+    }
+
 }

src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java

@@ -3,6 +3,7 @@ package com.example.demo.serviceImpl.coin;
 import com.example.demo.domain.entity.UserGoldRecord;
 import com.example.demo.mapper.coin.RechargeMapper;
 import com.example.demo.mapper.coin.UserMapper;
+import com.example.demo.service.coin.MarketService;
 import com.example.demo.service.coin.RechargeService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -34,11 +35,17 @@ public class RechargeServiceImpl implements RechargeService {
     @Autowired
     private UserMapper userMapper;
 
+    @Autowired
+    private MarketService marketService;
+
 
 
     //查询所有充值
     @Override
     public PageInfo<RechargeUser> selectAll(Integer pageNum, Integer pageSize, RechargeUser rechargeUser) throws  Exception{
+        //获取市场id
+        List<String> markets = marketService.getMarketIds(rechargeUser.getMarkets());
+        rechargeUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<RechargeUser> rechargeUsers = rechargeMapper.selectAll(rechargeUser);
         return new PageInfo<>(rechargeUsers);
@@ -47,6 +54,8 @@ public class RechargeServiceImpl implements RechargeService {
     //查询筛选充值
     @Override
     public PageInfo<RechargeUser> selectBy(Integer pageNum, Integer pageSize, RechargeUser rechargeUser) throws  Exception{
+        List<String> markets = marketService.getMarketIds(rechargeUser.getMarkets());
+        rechargeUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<RechargeUser> rechargeUsers = rechargeMapper.selectBy(rechargeUser);
         return new PageInfo<>(rechargeUsers);
@@ -55,6 +64,8 @@ public class RechargeServiceImpl implements RechargeService {
     //统计金币记录
     @Override
     public Gold statsGold(RechargeUser rechargeUser) {
+        List<String> markets = marketService.getMarketIds(rechargeUser.getMarkets());
+        rechargeUser.setMarkets(markets);
         Gold gold = new Gold();
         List<RechargeUser> rechargeUsers = rechargeMapper.selectBy(rechargeUser);
 

src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java

@@ -4,6 +4,7 @@ import com.example.demo.domain.entity.UserGoldRecord;
 import com.example.demo.mapper.coin.ConsumeMapper;
 import com.example.demo.mapper.coin.RefundMapper;
 import com.example.demo.mapper.coin.UserMapper;
+import com.example.demo.service.coin.MarketService;
 import com.example.demo.service.coin.RefundService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -39,10 +40,14 @@ public class RefundServiceImpl implements RefundService {
     @Autowired
     private UserMapper userMapper;
 
+    @Autowired
+    private MarketService marketService;
 
     //查找全部退款
     @Override
     public PageInfo<RefundUser> selectAll(Integer pageNum, Integer pageSize, RefundUser refundUser) throws  Exception{
+        List<String> markets = marketService.getMarketIds(refundUser.getMarkets());
+        refundUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<RefundUser> refundUsers = refundMapper.selectAll(refundUser);
         return new PageInfo<>(refundUsers);
@@ -51,6 +56,8 @@ public class RefundServiceImpl implements RefundService {
     //统计退款金额
     @Override
     public Gold statsGold(RefundUser refundUser) {
+        List<String> markets = marketService.getMarketIds(refundUser.getMarkets());
+        refundUser.setMarkets(markets);
         Gold gold = new Gold();
         List<RefundUser> refundUsers = refundMapper.selectBy(refundUser);
 
@@ -86,6 +93,8 @@ public class RefundServiceImpl implements RefundService {
     //查找筛选退款
     @Override
     public PageInfo<RefundUser> selectBy(Integer pageNum, Integer pageSize, RefundUser refundUser)throws  Exception {
+        List<String> markets = marketService.getMarketIds(refundUser.getMarkets());
+        refundUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<RefundUser> refundUsers = refundMapper.selectBy(refundUser);
         return new PageInfo<>(refundUsers);

src/main/resources/mapper/ConsumeMapper.xml

@@ -24,10 +24,10 @@
         <where>
             ugr.type = 1 AND ugr.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
-            <if test="markets != null and markets.size() > 0 and '1' not in markets">
+            <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
                 AND (
                 <foreach collection="markets" item="market" open="" close="" separator=" OR ">
-                    u.market LIKE CONCAT('%', #{market}, '%')
+                    u.market = #{market}
                 </foreach>
                 )
             </if>
@@ -92,11 +92,12 @@
         admin a ON ugr.admin_id = a.id
         <where>
             ugr.type = 1 AND ugr.flag = 1
-            <if test="markets != null and markets.size > 0 and !(markets.size() == 1 and markets[0] == '')">
-                AND u.market IN
-                <foreach collection="markets" item="market" open="(" separator="," close=")">
-                    #{market}
+            <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
+                AND (
+                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
+                    u.market = #{market}
                 </foreach>
+                )
             </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}

src/main/resources/mapper/MarketMapper.xml

@@ -4,4 +4,26 @@
     <select id="getMarket" resultType="com.example.demo.domain.entity.Market">
         select * from market
     </select>
+
+    <!-- 根据名称列表查询对应的市场ID及其子市场ID -->
+    <select id="getMarketIds" parameterType="java.util.List" resultType="java.lang.String">
+        SELECT id
+        FROM market
+        WHERE
+        -- 匹配名称的市场ID
+        name IN
+        <foreach collection="list" item="name" open="(" separator="," close=")">
+            #{name}
+        </foreach>
+        OR
+        -- 父ID是上述市场ID的子市场
+        parent_id IN (
+        SELECT id
+        FROM market
+        WHERE name IN
+        <foreach collection="list" item="name" open="(" separator="," close=")">
+            #{name}
+        </foreach>
+        )
+    </select>
 </mapper>

src/main/resources/mapper/RechargeMapper.xml

@@ -28,11 +28,12 @@
             ugr.type = 0 AND ugr.audit_status IN (1,3)
             AND ugr.flag = 1
 
-            <if test="markets!= null and markets.size > 0">
-                AND user.market IN
-                <foreach collection="markets" item="markets" open="(" separator="," close=")">
-                    #{markets}
+            <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
+                AND (
+                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
+                    u.market = #{market}
                 </foreach>
+                )
             </if>
         </where>
         <trim prefix="ORDER BY" suffixOverrides=",">
@@ -96,11 +97,12 @@
             ugr.type = 0 AND ugr.audit_status IN (1,3)
             AND ugr.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
-            <if test="markets != null and markets.size > 0 and !(markets.size() == 1 and markets[0] == '')">
-                AND u.market IN
-                <foreach collection="markets" item="market" open="(" separator="," close=")">
-                    #{market}
+            <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
+                AND (
+                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
+                    u.market = #{market}
                 </foreach>
+                )
             </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}

src/main/resources/mapper/RefundMapper.xml

@@ -26,10 +26,10 @@
         <where>
             ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
-            <if test="markets != null and markets.size() > 0 and '1' not in markets">
+            <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
                 AND (
                 <foreach collection="markets" item="market" open="" close="" separator=" OR ">
-                    u.market LIKE CONCAT('%', #{market}, '%')
+                    u.market = #{market}
                 </foreach>
                 )
             </if>
@@ -95,11 +95,12 @@
         admin a ON ugr.admin_id = a.id
         <where>
             ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
-            <if test="markets != null and markets.size > 0 and !(markets.size() == 1 and markets[0] == '')">
-                AND u.market IN
-                <foreach collection="markets" item="market" open="(" separator="," close=")">
-                    #{market}
+            <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
+                AND (
+                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
+                    u.market = #{market}
                 </foreach>
+                )
             </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}

src/main/resources/mapper/RoleMapper.xml

@@ -37,7 +37,7 @@
         SELECT id,role_name FROM role
         <where>
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
-            <if test="markets != null and markets.size() > 0 and '1' not in markets">
+            <if test="markets != null and markets.size() > 0 and '总部' not in markets and '研发部' not in markets">
                 AND market IN
                 <foreach collection="markets" item="market" open="(" close=")" separator=",">
                     #{market}
@@ -91,7 +91,7 @@
                 r.market LIKE CONCAT('%', #{market}, '%')
             </if>
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
-            <if test="markets != null and markets.size() > 0 and '1' not in markets">
+            <if test="markets != null and markets.size() > 0 and '总部' not in markets and '研发部' not in markets">
                 AND r.market IN
                 <foreach collection="markets" item="market" open="(" close=")" separator=",">
                     #{market}