Merge branch 'main-meitian' into main-pgt

ff-game/src/main/java/com/ff/game/api/db/client/DBSportsClient.java

@@ -99,7 +99,11 @@ public interface DBSportsClient {
     /**
      * 拉取订单Json数据
      */
-    @Post(url = "/api/bet/queryBetListV2")
+    @Post(url = "/api/bet/queryBetListV2",
+            headers = {
+                    "Content-type: application/x-www-form-urlencoded"
+            }
+    )
     GetBetListResponse getBetList(@Body GetBetListRequest request,
                                   @Header("requestId") String requestId);
 

ff-game/src/main/java/com/ff/game/api/db/dto/GetBetListRequest.java

@@ -67,7 +67,7 @@ public class GetBetListRequest implements Serializable {
     /**
      * 请求时间戳（13位，必填）
      */
-    private String timestamp;
+    private String timestamp = String.valueOf(System.currentTimeMillis());
 
     /**
      * 排序方式（可选）

ff-game/src/main/java/com/ff/game/api/db/dto/GetBetListResponse.java

@@ -18,16 +18,21 @@ public class GetBetListResponse implements Serializable {
     private String msg;
     private String code;
     private Long serverTime;
+    private DataDTO data;
+
+    @Data
+    public static class DataDTO {
 
 
-    // 当前页码
+        // 当前页码
-    private Integer pageNum;
+        private Integer pageNum;
-    // 每页条数
+        // 每页条数
-    private Integer pageSize;
+        private Integer pageSize;
-    // 总条数
+        // 总条数
-    private Integer totalCount;
+        private Integer totalCount;
-    // 注单列表
+        // 注单列表
-    private List<OrderItemDTO> list;
+        private List<OrderItemDTO> list;
+    }
 
     @Data
     public static class OrderItemDTO {

ff-game/src/main/java/com/ff/game/api/db/impl/DBSportsServiceImpl.java

@@ -388,8 +388,8 @@ public class DBSportsServiceImpl implements IGamesService {
     void getRealtimeRecord(BetRecordByTimeDTO requestDTO, int pageNum) {
 
         GetBetListRequest request = new GetBetListRequest();
-        request.setStartTime(String.valueOf(requestDTO.getStartTime()));
+        request.setStartTime(/*String.valueOf(requestDTO.getStartTime())*/ "1744333220000");
-        request.setEndTime(String.valueOf(requestDTO.getEndTime()));
+        request.setEndTime(/*String.valueOf(requestDTO.getEndTime())*/ "1744335020000");
         request.setMerchantCode(requestDTO.getAgentId());
         request.setPageNum(pageNum);
         request.setPageSize(1000);
@@ -400,7 +400,7 @@ public class DBSportsServiceImpl implements IGamesService {
         );
 
         if (this.isSuccess(response.getCode())) {
-            List<GetBetListResponse.OrderItemDTO> list = response.getList();
+            List<GetBetListResponse.OrderItemDTO> list = response.getData().getList();
             if (CollectionUtils.isEmpty(list)) {
                 return;
             }