Merge branch 'milestone-20251104-现金管理二期' into sunjiabei/feature-20251021102635-银行接口

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

@@ -3,6 +3,7 @@ package com.example.demo.controller.cash;
 import com.example.demo.Util.JWTUtil;
 import com.example.demo.domain.DTO.IdRequest;
 import com.example.demo.domain.entity.Admin;
+import com.example.demo.domain.vo.cash.Status;
 import com.example.demo.domain.vo.coin.Result;
 import com.example.demo.service.cash.MessageService;
 import com.example.demo.service.coin.MarketService;
@@ -38,7 +39,7 @@ public class MessageController {
     @Autowired
     private MarketService marketService;
     @PostMapping
-    public Result getMessage(@RequestParam Integer status) throws Exception {
+    public Result getMessage(@RequestBody Status  status) throws Exception {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String token = request.getHeader("token");
 
@@ -51,7 +52,7 @@ public class MessageController {
         if (markets.contains("9") || markets.contains("9999")) {
            markets=null;
         }
-        return Result.success(messageService.getMessage(markets, status));
+        return Result.success(messageService.getMessage(markets, status.getStatus()));
     }
     @PostMapping("/update")
     public Result update(@RequestBody IdRequest idRequest) throws Exception {

src/main/java/com/example/demo/domain/vo/cash/CashCollection.java

@@ -1,5 +1,6 @@
 package com.example.demo.domain.vo.cash;
 
+import cn.hutool.core.date.DateTime;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -10,6 +11,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -96,16 +98,16 @@ public class CashCollection implements Serializable {
     private String rejectReason;        // 驳回理由
     @ExcelIgnore
     private String auditId;             //审核人id
-    @ExcelProperty("审核人")
+    @ExcelProperty("审核人" )
     private String auditName;           //审核人姓名
     @ExcelIgnore
     private Integer cashRoleId;         //角色id(0客服，1地区财务/负责人，2总部)
     @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
-    private LocalDateTime createTime;
+    private Date createTime;
     @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
-    private LocalDateTime updateTime;
+    private Date updateTime;
     @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private LocalDateTime auditTime;
@@ -113,10 +115,10 @@ public class CashCollection implements Serializable {
     //搜索筛条件
     @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
-    private LocalDateTime startTime; // 付款时间起
+    private Date startTime; // 付款时间起
     @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
-    private LocalDateTime endTime;   // 付款时间止
+    private Date endTime;   // 付款时间止
     @ExcelIgnore
     private String sortField; //排序字段
     @ExcelIgnore

src/main/java/com/example/demo/domain/vo/cash/Status.java

@@ -0,0 +1,22 @@
+package com.example.demo.domain.vo.cash;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @program: GOLD
+ * @ClassName Status
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−11-21 18:32
+ * @Version 1.0
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Status {
+    private List<Integer> status;
+}

src/main/java/com/example/demo/domain/vo/coin/Messages.java

@@ -32,6 +32,7 @@ public class Messages {
     private Integer typeId;
     private Integer market;
     private Integer flag;
+    private String marketName;
 
 
 }

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

@@ -1,6 +1,6 @@
 package com.example.demo.mapper.cash;
 
-import com.example.demo.domain.DTO.PaymentDTO;
+//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;
@@ -61,5 +61,5 @@ public interface CashCollectionMapper {
     //根据glodcoin订单号查询收款订单
     CashCollection selectByGoldCoinOrderCode(String orderNo);
 
-    void updateByGoldCoinOrderCode(PaymentDTO paymentDTO);
+//    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, Integer status);
+    List<Messages> getMessage(List<String> markets, List<Integer> status);
 
     void update(Integer id);
 }

src/main/java/com/example/demo/service/cash/MessageService.java

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

src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java

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

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -198,7 +198,7 @@
                 ORDER BY ${cashCollection.sortField} ${cashCollection.sortOrder}
             </when>
             <otherwise>
-                ORDER BY pay_time DESC
+                ORDER BY create_time DESC
             </otherwise>
         </choose>
     </select>

src/main/resources/cashMapper/MessageMapper.xml

@@ -7,22 +7,36 @@
         where id=#{id}
     </update>
     <select id="getMessage" resultType="com.example.demo.domain.vo.coin.Messages">
-        SELECT id, jwcode, name, title, `desc`, status, market,type, type_id,flag,cz_time
-        FROM message
+        SELECT
+        m.id,
+        m.jwcode,
+        m.name,               <!-- ✅ message.name -->
+        m.title,
+        m.`desc`,
+        m.status,
+        m.market,
+        m.type,
+        m.type_id,
+        m.flag,
+        m.cz_time,
+        mk.name AS market_name  <!-- ✅ market.name -->
+        FROM message m
+        LEFT JOIN market mk ON m.market = mk.id
         <where>
-            flag=0
-            <if test="status != null">
-                and status=#{status}
+            m.flag = 0
+            <if test="status != null and status.size() > 0">
+                AND m.status IN
+                <foreach item="item" collection="status" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="markets != null and markets.size() > 0">
+                AND m.market IN
+                <foreach item="item" collection="markets" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
-            <choose>
-                <when test="markets != null and markets.size() > 0">
-                    market IN
-                    <foreach item="item" collection="markets" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
-                </when>
-            </choose>
-                    ORDER BY cz_time DESC
         </where>
+        ORDER BY m.cz_time DESC
     </select>
 </mapper>