Merge remote-tracking branch 'origin/milestone-20251104-现金管理二期' into milestone-20251104-现金管理二期

src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java

@@ -27,6 +27,8 @@ public class BeanConsumeFan {
     private Integer id;
     @ExcelProperty("姓名")
     private String name;    //姓名
+    @ExcelIgnore
+    private Integer roleId; //角色Id
     @ExcelProperty("精网号")
     private Integer jwcode; //精网号
     @ExcelProperty("地区")

src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java

@@ -28,6 +28,8 @@ public class BeanConsumeLive {
     private static final long serialVersionUID = 1L;
     @ExcelProperty("ID")
     private Integer id;
+    @ExcelIgnore
+    private Integer roleId; //角色Id
     @ExcelProperty("姓名")
     private String name;    //姓名
     @ExcelProperty("精网号")
@@ -48,7 +50,7 @@ public class BeanConsumeLive {
     @ExcelProperty("金豆数量")
     private String beanNum; //金豆数量
     @ExcelProperty("频道")
-    private String liveChannel;  //频道名称（截取content）
+    private String liveChannel;  //频道名称
     @ExcelProperty("免费金豆")
     private String freeBean; //免费金豆
     @ExcelProperty("付费金豆")

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

@@ -27,4 +27,5 @@ public interface AdminMapper {
 
 
     String getName(String account);
+
 }

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

@@ -48,4 +48,6 @@ public interface RoleMapper {
     RoleVo selectFather(Integer id);
     //修改角色
     void updateRole(RoleVo roleVo);
+    //根据角色id获取频道
+    String getChannel(Integer roleId);
 }

src/main/java/com/example/demo/mapper/live/LiveMapper.java

@@ -31,4 +31,5 @@ public interface LiveMapper {
     List<String> getDept();
     //获取直播消费列表总数
     int selectLiveCount(BeanConsumeLive beanConsumeLive);
+
 }

src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java

@@ -5,7 +5,9 @@ import com.example.demo.domain.vo.bean.*;
 import com.example.demo.domain.vo.coin.*;
 import com.example.demo.mapper.bean.BeanConsumeMapper;
 import com.example.demo.mapper.bean.BeanUserMapper;
+import com.example.demo.mapper.coin.AdminMapper;
 import com.example.demo.mapper.coin.BeanRechargeMapper1;
+import com.example.demo.mapper.coin.RoleMapper;
 import com.example.demo.mapper.coin.UserMapper;
 import com.example.demo.mapper.live.LiveMapper;
 import com.example.demo.service.bean.BeanConsumeService;
@@ -45,7 +47,7 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
     @Autowired
     private BeanRechargeMapper1 beanRechargeMapper1;
     @Autowired
-    private UserMapper userMapper;
+    private RoleMapper roleMapper;
     @Autowired
     private RestTemplate restTemplate;
     // 构建接口URL及参数
@@ -157,6 +159,14 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
     @Override
     public Object selectLiveBy(Integer pageNum, Integer pageSize, BeanConsumeLive beanConsumeLive) {
         PageHelper.startPage(pageNum, pageSize);
+        String channel=roleMapper.getChannel(beanConsumeLive.getRoleId());
+        if (channel==null){
+            return "角色频道有误";
+        }
+        if (!channel.equals("全部")){
+            beanConsumeLive.setLiveChannel(channel);
+        }
+
         List<BeanConsumeLive> beanConsumeLives = liveMapper.selectLiveBy(beanConsumeLive);
         //int total = liveMapper.selectLiveCount(beanConsumeLive);
         return new PageInfo<>(beanConsumeLives);
@@ -165,6 +175,13 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
     @Override
     public Object selectFanBy(Integer pageNum, Integer pageSize, BeanConsumeFan beanConsumeFan) {
         PageHelper.startPage(pageNum, pageSize);
+        String channel=roleMapper.getChannel(beanConsumeFan.getRoleId());
+        if (channel==null){
+            return "角色频道有误";
+        }
+        if (!channel.equals("全部")){
+            beanConsumeFan.setChannel(channel);
+        }
         List<BeanConsumeFan> beanConsumeFans = beanConsumeMapper.selectFanBy(beanConsumeFan);
         return new PageInfo<>(beanConsumeFans);
     }

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -170,7 +170,7 @@
                 </otherwise>
             </choose>
         <if test="cashCollection.activity!=null and cashCollection.activity!=''">
-            AND cr.activity like concat('%',#{cashCollection.activity},'%')
+            AND cr.activity =#{cashCollection.activity}
         </if>
         <if test="cashCollection.paymentCurrency!=null and cashCollection.paymentCurrency!=''">
             AND cr.payment_currency like concat('%',#{cashCollection.paymentCurrency},'%')

src/main/resources/mapper/RoleMapper.xml

@@ -116,5 +116,9 @@
                        LEFT JOIN role as father ON r.father_id = father.id
         where r.id = #{id}
     </select>
+    <!--根据角色id获取频道-->
+    <select id="getChannel" resultType="java.lang.String">
+        select channel from role where id = #{roleId}
+    </select>
 
 </mapper>