修改查询

service/trade-service-source/trade-service-source-api/src/main/java/com/hchbox/vo/taobao/TaoBaoOrderSearchVO.java

@@ -102,7 +102,7 @@ public class TaoBaoOrderSearchVO implements Serializable {
      */
     @Query
     @ApiModelProperty("订单来源")
-    private String orderSource;
+    private String tradeSource;
 
 
     /**
@@ -122,16 +122,16 @@ public class TaoBaoOrderSearchVO implements Serializable {
     /**
      *
      */
-    @Query
+    @Query(type = Query.Type.INNER_LIKE, propName = "tid")
     @ApiModelProperty("订单编号")
     private Long tid;
 
     /**
      * 买家昵称 合集
      */
-    @Query(type = Query.Type.IN,propName = "buyerNick")
+    @Query(type = Query.Type.IN)
     @ApiModelProperty("买家昵称")
-    private List<String> buyerNicks;
+    private List<String> buyerNick;
 
 
     /**
@@ -139,7 +139,7 @@ public class TaoBaoOrderSearchVO implements Serializable {
      */
     @Query(type = Query.Type.NOT_EQUAL, propName = "type")
     @ApiModelProperty("过滤类型")
-    private Integer filterType;
+    private Integer type;
 
 
     @ApiModelProperty("发送类型 3 不过滤 2指定天数 1今天")

service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SellerAccountController.java

@@ -1,7 +1,6 @@
 
 package com.hchbox.controller;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.hchbox.annotaion.SellerUser;
 import com.hchbox.constant.DefaultNumberConstants;
@@ -9,21 +8,19 @@ import com.hchbox.dto.SellerAccountDTO;
 import com.hchbox.entity.master.SellerAccount;
 import com.hchbox.enums.ResponseCode;
 import com.hchbox.model.param.CommonResult;
+import com.hchbox.service.SellerAccountService;
 import com.hchbox.service.TaoBaoMessageService;
-import com.hchbox.vo.AccountSearchVo;
+import com.hchbox.service.TaoBaoRdsPushService;
 import com.hchbox.vo.SubAccountsVo;
 import com.hchbox.vo.UpdateAccountsVo;
-import com.hchbox.vo.UpdateSellerVo;
-import com.hchbox.service.SellerAccountService;
-import com.hchbox.service.TaoBaoRdsPushService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.data.domain.Page;
 
 import java.util.ArrayList;
 import java.util.List;

service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/TaskMessageController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
@@ -55,7 +56,8 @@ public class TaskMessageController {
 
     @GetMapping("/getMessageContent")
     @ApiOperation("查询实时发送详情")
-    public CommonResult<List<Map<String, String>>> getMessageContent(Date date) {
+    public CommonResult<List<Map<String, String>>> getMessageContent(
+            @RequestParam("date") @DateTimeFormat(pattern="yyyy-mm-dd HH:mm:ss") Date date) {
         return taskSendMessageService.getRedisMessage(date);
     }