order search to post feign

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/trade/order/OrderClient.java

@@ -4,6 +4,8 @@ import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.data.api.trade.dto.OrderDTO;
 import cn.rankin.data.api.trade.dto.OrderDetailSearchDTO;
+import cn.rankin.data.api.trade.dto.OrderSearchDTO;
+import cn.rankin.data.api.trade.dto.OrderSnapshotSearchDTO;
 import cn.rankin.data.api.trade.entity.Order;
 import cn.rankin.data.api.trade.entity.OrderDetail;
 import cn.rankin.data.api.trade.entity.OrderProductSnapshot;
@@ -16,8 +18,8 @@ import java.util.Map;
 public interface OrderClient {
 
     // 此处返回值不用Vo，需要进一步处理
-    @RequestMapping(value = "/order/list", method = RequestMethod.GET)
-    APIResult<Page<Order>> search(@RequestParam Map<String, Object> searchDTO);
+    @RequestMapping(value = "/order/list", method = RequestMethod.POST)
+    APIResult<Page<Order>> search(@RequestBody OrderSearchDTO searchDTO);
 
     @RequestMapping(value = "/order", method = RequestMethod.POST)
     APIResult<Order> create(@RequestBody OrderDTO orderDTO);
@@ -31,8 +33,8 @@ public interface OrderClient {
     @RequestMapping(value = "/order/pay/{orderId}", method = RequestMethod.DELETE)
     APIResult<Boolean> cancel(@PathVariable("orderId") String orderId);
 
-    @RequestMapping(value = "/order/snapshot", method = RequestMethod.GET)
-    APIResult<Page<OrderProductSnapshot>> searchSnapshot(@RequestParam Map<String, Object> searchDTO);
+    @RequestMapping(value = "/order/snapshot", method = RequestMethod.POST)
+    APIResult<Page<OrderProductSnapshot>> searchSnapshot(@RequestBody OrderSnapshotSearchDTO searchDTO);
 
     @RequestMapping(value = "/order/detail", method = RequestMethod.POST)
     APIResult<Page<OrderDetail>> searchDetail(@RequestBody OrderDetailSearchDTO searchDTO);

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/trade/order/OrderService.java

@@ -18,6 +18,7 @@ import cn.rankin.data.api.product.vo.GoodsVo;
 import cn.rankin.data.api.trade.dto.OrderDTO;
 import cn.rankin.data.api.trade.dto.OrderDetailSearchDTO;
 import cn.rankin.data.api.trade.dto.OrderGoodsDTO;
+import cn.rankin.data.api.trade.dto.OrderSearchDTO;
 import cn.rankin.data.api.trade.entity.OrderDetail;
 import cn.rankin.data.api.trade.entity.OrderGoods;
 import cn.rankin.data.api.trade.entity.Order;
@@ -224,16 +225,16 @@ public class OrderService {
         List<TerminalUserVo> terminalUserVoList = findTerminalUsers(userCode, campusCode, campusName, merchantId);
         terminalUserVoList.forEach(terminalUserVo -> userIdList.add(terminalUserVo.getId()));
 
-        Map<String, Object> searchParams = new HashMap<>();
-        searchParams.put("pageNo", searchWebDTO.getPageNo());
-        searchParams.put("pageSize", searchWebDTO.getPageSize());
-        searchParams.put("beginTime", searchWebDTO.getBeginTime());
-        searchParams.put("endTime", searchWebDTO.getEndTime());
-        searchParams.put("status", searchWebDTO.getStatus());
-        searchParams.put("uid", userIdList);
-        searchParams.put("merchantId", merchantId);
+        OrderSearchDTO searchDTO = new OrderSearchDTO();
+        searchDTO.setPageNo(searchWebDTO.getPageNo());
+        searchDTO.setPageSize(searchWebDTO.getPageSize());
+        searchDTO.setBeginTime(searchWebDTO.getBeginTime());
+        searchDTO.setEndTime(searchWebDTO.getEndTime());
+        searchDTO.setStatus(searchWebDTO.getStatus());
+        searchDTO.setUid(userIdList);
+        searchDTO.setMerchantId(merchantId);
 
-        APIResult<Page<Order>> orderAPIResult = orderClient.search(searchParams);
+        APIResult<Page<Order>> orderAPIResult = orderClient.search(searchDTO);
         if (!orderAPIResult.getSuccess()) {
             log.error("order query error: {}", orderAPIResult.getMessage());
             return APIResult.error(new BaseCode(orderAPIResult.getCode(), orderAPIResult.getMessage()));
@@ -415,8 +416,7 @@ public class OrderService {
     }
 
     public APIResult<Page<OrderProductSnapshot>> search(OrderSnapshotWebSearchDTO searchDTO) {
-        Map<String, Object> map = BeanUtil.convertToMap(searchDTO);
-        return orderClient.searchSnapshot(map);
+        return orderClient.searchSnapshot(convert(searchDTO));
     }
 
     // 根据搜索条件查找用户

rankin-cms-web/src/main/java/cn/rankin/cmsweb/utils/DTOConverter.java

@@ -1,5 +1,7 @@
 package cn.rankin.cmsweb.utils;
 
+import cn.rankin.data.api.cms.OrderSnapshotWebSearchDTO;
+import cn.rankin.data.api.trade.dto.OrderSnapshotSearchDTO;
 import cn.rankin.data.api.trade.entity.Order;
 import cn.rankin.data.api.trade.entity.OrderDetail;
 import cn.rankin.data.api.trade.vo.OrderDetailVo;
@@ -19,4 +21,10 @@ public class DTOConverter {
         BeanUtils.copyProperties(orderDetail, orderDetailVo);
         return orderDetailVo;
     }
+
+    public static OrderSnapshotSearchDTO convert(OrderSnapshotWebSearchDTO searchDTO) {
+        OrderSnapshotSearchDTO snapshotSearchDTO = new OrderSnapshotSearchDTO();
+        BeanUtils.copyProperties(searchDTO, snapshotSearchDTO);
+        return snapshotSearchDTO;
+    }
 }

rankin-data-api/src/main/java/cn/rankin/data/api/cms/OrderSearchWebDTO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.Date;
 
 @Data
 @ToString
@@ -18,9 +19,9 @@ public class OrderSearchWebDTO implements Serializable {
 
     private String campusCode;
 
-    protected String beginTime;
+    protected Date beginTime;
 
-    protected String endTime;
+    protected Date endTime;
 
     protected OrderStatusEnum status;
 

rankin-data-api/src/main/java/cn/rankin/data/api/cms/OrderSnapshotWebSearchDTO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.Date;
 
 @Data
 @ToString
@@ -31,9 +32,9 @@ public class OrderSnapshotWebSearchDTO implements Serializable {
 
     private String merchantId;
 
-    protected String beginTime;
+    protected Date beginTime;
 
-    protected String endTime;
+    protected Date endTime;
 
     private Integer pageNo = 1;
 

rankin-trade-service/src/main/java/cn/rankin/tradeservice/controller/OrderController.java

@@ -51,8 +51,8 @@ public class OrderController {
         return orderService.getOrder(orderId);
     }
 
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public APIResult<Page<Order>> search(OrderSearchDTO searchDTO) {
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public APIResult<Page<Order>> search(@RequestBody OrderSearchDTO searchDTO) {
         return orderService.search(searchDTO);
     }
 
@@ -73,8 +73,8 @@ public class OrderController {
     }
 
     // 查询交易快照
-    @RequestMapping(value = "/snapshot", method = RequestMethod.GET)
-    public APIResult<Page<OrderProductSnapshot>> search(OrderSnapshotSearchDTO searchDTO) {
+    @RequestMapping(value = "/snapshot", method = RequestMethod.POST)
+    public APIResult<Page<OrderProductSnapshot>> search(@RequestBody OrderSnapshotSearchDTO searchDTO) {
         return orderProductSnapshotService.search(searchDTO);
     }