11月21日收款接口

src/main/java/com/example/demo/controller/cash/CashRefundController.java

@@ -126,27 +126,27 @@ public class CashRefundController {
             return Result.error("页大小为空！");
         }
 
-// 获取传入的市场列表
-        List<String> requestedMarkets = page.getCashRecordDTO() != null ? page.getCashRecordDTO().getMarkets() : null;
-
-// 权限校验逻辑
-        if (markets.contains("9") || markets.contains("9999")) {
-            // 特权市场：9 或 9999，跳过权限校验，直接放行传入的 markets
-            // 如果业务需要，也可以在这里做空值处理
-            if (page.getCashRecordDTO() != null) {
-                // 保持 requestedMarkets 不变，原样接受
-                // 可选：如果 requestedMarkets 为 null，可设为默认值或保持 null
-            }
-        } else {
-            // 普通用户：必须校验权限
-            if (requestedMarkets == null || requestedMarkets.isEmpty()) {
-                page.getCashRecordDTO().setMarkets(markets);
-            }
-            if (!markets.containsAll(requestedMarkets)) {
-                return Result.error("无权限！请求的市场不在授权范围内。");
-            }
-            // 校验通过，保持 requestedMarkets 不变
-        }
+//// 获取传入的市场列表
+//        List<String> requestedMarkets = page.getCashRecordDTO() != null ? page.getCashRecordDTO().getMarkets() : null;
+//
+//// 权限校验逻辑
+//        if (markets.contains("9") || markets.contains("9999")) {
+//            // 特权市场：9 或 9999，跳过权限校验，直接放行传入的 markets
+//            // 如果业务需要，也可以在这里做空值处理
+//            if (page.getCashRecordDTO() != null) {
+//                // 保持 requestedMarkets 不变，原样接受
+//                // 可选：如果 requestedMarkets 为 null，可设为默认值或保持 null
+//            }
+//        } else {
+//            // 普通用户：必须校验权限
+//            if (requestedMarkets == null || requestedMarkets.isEmpty()) {
+//                page.getCashRecordDTO().setMarkets(markets);
+//            }
+//            if (!markets.containsAll(requestedMarkets)) {
+//                return Result.error("无权限！请求的市场不在授权范围内。");
+//            }
+//            // 校验通过，保持 requestedMarkets 不变
+//        }
         return Result.success(refundService.exSelect(page.getPageNum(), page.getPageSize(), page.getCashRecordDTO()));
     }
     /**

src/main/java/com/example/demo/controller/cash/MessageController.java

@@ -38,7 +38,7 @@ public class MessageController {
     @Autowired
     private MarketService marketService;
     @PostMapping
-    public Result getMessage() throws Exception {
+    public Result getMessage(@RequestParam Integer status) throws Exception {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String token = request.getHeader("token");
 
@@ -51,7 +51,7 @@ public class MessageController {
         if (markets.contains("9") || markets.contains("9999")) {
            markets=null;
         }
-        return Result.success(messageService.getMessage(markets));
+        return Result.success(messageService.getMessage(markets, status));
     }
     @PostMapping("/update")
     public Result update(@RequestBody IdRequest idRequest) throws Exception {

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/cash/CashCollectionMapper.java

@@ -1,5 +1,6 @@
 package com.example.demo.mapper.cash;
 
+import com.example.demo.domain.DTO.PaymentDTO;
 import com.example.demo.domain.entity.CashRecord;
 import com.example.demo.domain.entity.GOrder;
 import com.example.demo.domain.entity.RechargeActivity;
@@ -59,4 +60,6 @@ public interface CashCollectionMapper {
     List<CashCollection> selectBatchIds(Set<Integer> relatedIds);
     //根据glodcoin订单号查询收款订单
     CashCollection selectByGoldCoinOrderCode(String orderNo);
+
+    void updateByGoldCoinOrderCode(PaymentDTO paymentDTO);
 }

src/main/java/com/example/demo/mapper/cash/MessageMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
  **/
 @Mapper
 public interface MessageMapper {
-    List<Messages> getMessage(List<String> markets);
+    List<Messages> getMessage(List<String> markets, Integer status);
 
     void update(Integer id);
 }

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/service/cash/MessageService.java

@@ -1,6 +1,7 @@
 package com.example.demo.service.cash;
 
 import com.example.demo.domain.vo.coin.Messages;
+import com.stripe.model.tax.Registration;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -15,7 +16,7 @@ import java.util.List;
  **/
 @Service
 public interface MessageService {
-    List<Messages> getMessage(List<String> markets);
+    List<Messages> getMessage(List<String> markets, Integer status);
 
     void update(Integer id) throws Exception;
 }

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/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java

@@ -23,8 +23,8 @@ public class MessageServiceImpl implements MessageService {
     @Autowired
     private MessageMapper messageMapper;
     @Override
-    public List<Messages> getMessage(List<String> markets) {
-        return messageMapper.getMessage(markets) ;
+    public List<Messages> getMessage(List<String> markets, Integer status) {
+        return messageMapper.getMessage(markets, status) ;
     }
 
     @Override

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

@@ -29,7 +29,7 @@ public class RechargeActivityCenterServiceImpl implements RechargeActivityCenter
     @Autowired
     private RechargeActivityCenterMapper rechargeActivityCenterMapper;
 
-    private static final String ACTIVITY_NAME_REGEX = "^[\\u4e00-\\u9fa5a-zA-Z0-9，。！？、；：\"'‘’“”（）《》【】——～,.:;!()\\[\\]-_&+=]{1,100}$";
+    private static final String ACTIVITY_NAME_REGEX = "^[\\u4e00-\\u9fa5a-zA-Z0-9，。！？?、；：\"'‘’“”（）《》【】—～~,.:;!()\\[\\]\\-_&+=]{1,100}$";
     private static final Pattern ACTIVITY_NAME_PATTERN = Pattern.compile(ACTIVITY_NAME_REGEX);
     // 根据ID查询活动
     @Override
@@ -71,7 +71,7 @@ public class RechargeActivityCenterServiceImpl implements RechargeActivityCenter
             // 去除最后一个顿号，拼接提示信息
             String illegalStr = illegalChars.deleteCharAt(illegalChars.length() - 1).toString();
             throw new IllegalArgumentException(
-                    String.format("活动名称包含非法字符：%s，仅允许包含汉字、英文字母、数字及常见标点符号（中英文标点：，。！？、；：\"'‘’“”（）《》【】——～,.:;!()[]-_&+=）", illegalStr)
+                    String.format("活动名称包含非法字符：%s，仅允许包含汉字、英文字母、数字及常见标点符号（中英文标点：，。！？?、；：\"'‘’“”（）《》【】—～~,.:;!()[]-_&+=）", illegalStr)
             );
         }
 

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},'%')
@@ -198,7 +198,7 @@
                 ORDER BY ${cashCollection.sortField} ${cashCollection.sortOrder}
             </when>
             <otherwise>
-                ORDER BY update_time DESC
+                ORDER BY pay_time DESC
             </otherwise>
         </choose>
     </select>
@@ -276,4 +276,19 @@
     <select id="selectByGoldCoinOrderCode" resultType="com.example.demo.domain.vo.cash.CashCollection">
         select * from cash_record_collection where order_no=#{orderNo}
     </select>
+
+    <!--根据glodcoin订单号更新收款订单-->
+    <update id="updateByGoldCoinOrderCode">
+        update cash_record_collection
+        <set>
+            received_time=#{time},
+            payment_currency=#{currency},
+            received_currency=#{currency},
+            payment_amount=#{order_amount},
+            received_amount=#{net_amount},
+            handling_charge=#{charge},
+            order_no_status=0
+        </set>
+        where order_code=#{merchant_reference}
+    </update>
 </mapper>

src/main/resources/cashMapper/MessageMapper.xml

@@ -11,6 +11,9 @@
         FROM message
         <where>
             flag=0
+            <if test="status != null">
+                and status=#{status}
+            </if>
             <choose>
                 <when test="markets != null and markets.size() > 0">
                     market IN
@@ -19,14 +22,7 @@
                     </foreach>
                 </when>
             </choose>
-            <choose>
-                <when test="sortField != null and sortField.length > 0 or sortOrder != null and sortOrder.length > 0">
-                    ORDER BY ${sortField} ${sortOrder}
-                </when>
-                <otherwise>
                     ORDER BY cz_time DESC
-                </otherwise>
-            </choose>
         </where>
     </select>
 </mapper>

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>