Merge branch 'main-meitian' into main-pgt

main-pgt
shi 2025-04-11 16:56:37 +08:00
commit 9352c50a22
4 changed files with 22 additions and 13 deletions

View File

@ -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);

View File

@ -67,7 +67,7 @@ public class GetBetListRequest implements Serializable {
/**
* 13
*/
private String timestamp;
private String timestamp = String.valueOf(System.currentTimeMillis());
/**
*

View File

@ -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<OrderItemDTO> list;
// 当前页码
private Integer pageNum;
// 每页条数
private Integer pageSize;
// 总条数
private Integer totalCount;
// 注单列表
private List<OrderItemDTO> list;
}
@Data
public static class OrderItemDTO {

View File

@ -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.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);
@ -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;
}