From 10c9601bbecf8c138446fa2bfb33442479af41ab Mon Sep 17 00:00:00 2001 From: cengy Date: Fri, 11 Apr 2025 11:23:33 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ff-game):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E6=B3=A8=E5=8D=95=E6=8B=89=E5=8F=96=E6=8E=A5=E5=8F=A3=E5=92=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86-=20=E5=9C=A8=20DBSportsCli?= =?UTF-8?q?ent=20=E4=B8=AD=E4=B8=BA=20getBetList=20=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Content-type=20=E5=A4=B4=20-=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20DBSportsServiceImpl=20=E4=B8=AD=E7=9A=84=20getRealt?= =?UTF-8?q?imeRecord=20=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E7=9A=84=E6=97=B6=E9=97=B4=E6=88=B3=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=B5=8B=E8=AF=95=20-=20=E6=9B=B4=E6=96=B0=20GetBetLi?= =?UTF-8?q?stRequest=20=E4=B8=AD=E7=9A=84=20timestamp=20=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BA=E5=BD=93=E5=89=8D=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=88=B3=20-=20=E9=87=8D=E6=9E=84=20GetBetListRespons?= =?UTF-8?q?e=20=E7=BB=93=E6=9E=84=EF=BC=8C=E5=B0=86=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B0=81=E8=A3=85=E5=88=B0=20DataDTO=20?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ff/sports/db/client/DBSportsClient.java | 6 +++++- .../ff/sports/db/dto/GetBetListRequest.java | 2 +- .../ff/sports/db/dto/GetBetListResponse.java | 21 ++++++++++++------- .../sports/db/impl/DBSportsServiceImpl.java | 6 +++--- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/ff-game/src/main/java/com/ff/sports/db/client/DBSportsClient.java b/ff-game/src/main/java/com/ff/sports/db/client/DBSportsClient.java index c144449..bbcc535 100644 --- a/ff-game/src/main/java/com/ff/sports/db/client/DBSportsClient.java +++ b/ff-game/src/main/java/com/ff/sports/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); diff --git a/ff-game/src/main/java/com/ff/sports/db/dto/GetBetListRequest.java b/ff-game/src/main/java/com/ff/sports/db/dto/GetBetListRequest.java index 13f95cd..c0736f2 100644 --- a/ff-game/src/main/java/com/ff/sports/db/dto/GetBetListRequest.java +++ b/ff-game/src/main/java/com/ff/sports/db/dto/GetBetListRequest.java @@ -67,7 +67,7 @@ public class GetBetListRequest implements Serializable { /** * 请求时间戳（13位，必填） */ - private String timestamp; + private String timestamp = String.valueOf(System.currentTimeMillis()); /** * 排序方式（可选） diff --git a/ff-game/src/main/java/com/ff/sports/db/dto/GetBetListResponse.java b/ff-game/src/main/java/com/ff/sports/db/dto/GetBetListResponse.java index aace488..a05a0d3 100644 --- a/ff-game/src/main/java/com/ff/sports/db/dto/GetBetListResponse.java +++ b/ff-game/src/main/java/com/ff/sports/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 pageSize; - // 总条数 - private Integer totalCount; - // 注单列表 - private List list; + // 当前页码 + private Integer pageNum; + // 每页条数 + private Integer pageSize; + // 总条数 + private Integer totalCount; + // 注单列表 + private List list; + } @Data public static class OrderItemDTO { diff --git a/ff-game/src/main/java/com/ff/sports/db/impl/DBSportsServiceImpl.java b/ff-game/src/main/java/com/ff/sports/db/impl/DBSportsServiceImpl.java index 2b74435..2e183d5 100644 --- a/ff-game/src/main/java/com/ff/sports/db/impl/DBSportsServiceImpl.java +++ b/ff-game/src/main/java/com/ff/sports/db/impl/DBSportsServiceImpl.java @@ -395,8 +395,8 @@ public class DBSportsServiceImpl implements IGamesService { void getRealtimeRecord(BetRecordByTimeDTO requestDTO, int pageNum) { GetBetListRequest request = new GetBetListRequest(); - request.setStartTime(String.valueOf(requestDTO.getStartTime())); - request.setEndTime(String.valueOf(requestDTO.getEndTime())); + request.setStartTime(/*String.valueOf(requestDTO.getStartTime())*/ "1744333220000"); + request.setEndTime(/*String.valueOf(requestDTO.getEndTime())*/ "1744335020000"); request.setMerchantCode(requestDTO.getAgentId()); request.setPageNum(pageNum); request.setPageSize(1000); @@ -407,7 +407,7 @@ public class DBSportsServiceImpl implements IGamesService { ); if (this.isSuccess(response.getCode())) { - List list = response.getList(); + List list = response.getData().getList(); if (CollectionUtils.isEmpty(list)) { return; }