Merge branch 'milestone-20251104-现金管理二期' of http://39.101.133.168:8807/huangqizhen/gold-java into lijianlin/feature-20251104110749-现金管理二期

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/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/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/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/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>