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

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

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -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,12 +11,17 @@
         FROM message
         <where>
             flag=0
-            <if test="status != null">
-                and status=#{status}
-            </if>
+            <choose>
+                <when test="status != null and status.size() > 0">
+                    and status IN
+                    <foreach item="item" collection="status" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </when>
+            </choose>
             <choose>
                 <when test="markets != null and markets.size() > 0">
-                    market IN
+                   and market IN
                     <foreach item="item" collection="markets" open="(" separator="," close=")">
                         #{item}
                     </foreach>