Merge branch 'feature/20210225-蜜雪订单列表查询返回结果字段优化-lcf'

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -3867,7 +3867,7 @@ public class OrderAdapter {
         return activityUpdateStockRequest;
     }
 
-    public OrderConditionsReq convent2QueryOrdersDtoES(OrderConditionsReq query, String memberId, String channelType, Integer queryOrderStatus,Integer queryOrderType) {
+    public OrderConditionsReq convent2QueryOrdersDtoES(OrderConditionsReq query, String memberId, String channelType, Integer queryOrderStatus,Integer queryOrderType, Integer queryPayStatus) {
         OrderConditionsReq queryOrdersDto = new OrderConditionsReq();
         queryOrdersDto.setUserId(memberId);
         queryOrdersDto.setPartnerId(query.getPartnerId());
@@ -3894,8 +3894,14 @@ public class OrderAdapter {
         orderClients.add(OrderClientType.ALIPAY.getIndex());
         queryOrdersDto.setOrderClients(orderClients);
 
-        List<Integer> payStatus = Arrays.asList(PayStatus.HAVE_PAID.getCode(), PayStatus.HAVE_REFUND.getCode(), PayStatus.COMPLETE.getCode());
-        queryOrdersDto.setPayStatuses(payStatus);
+        if (queryPayStatus == null){
+            List<Integer> payStatus = Arrays.asList(PayStatus.HAVE_PAID.getCode(), PayStatus.HAVE_REFUND.getCode(), PayStatus.COMPLETE.getCode());
+            queryOrdersDto.setPayStatuses(payStatus);
+        } else {
+            List<Integer> payStatus = Arrays.asList(queryPayStatus);
+            queryOrdersDto.setPayStatuses(payStatus);
+        }
+
         //queryOrdersDto.setPayStatus((Integer[]) payStatus.toArray());
         //TODO 查询退款的待确定
         if (queryOrderStatus != null) {
@@ -3963,6 +3969,8 @@ public class OrderAdapter {
         }
         queryOrdersDto.setOrderTypes(orderTypes);
 
+
+
         if (OrderChannelType.IWC.getCode().equals(channelType)) {
             Integer[] statuses = new Integer[]{OrderStatus.COMPLETE.getCode(), OrderStatus.CALCEL.getCode(), OrderStatus.WAIT_PAY.getCode()};
             List<Integer> orderStatuses = new ArrayList<>();

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderVo.java

@@ -38,6 +38,10 @@ public class QueryOrderVo {
      */
     private Integer queryOrderStatus;
     /**
+     * 订单支付状态 enum queryOrderStatus   全部订单 1 未支付 2 已支付 3 已退款   4. 部分退款
+     */
+    private Integer queryPayStatus;
+    /**
      * 查询订单状态 1 外卖  4 门店自提
      */
     private Integer queryOrderType;

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -847,7 +847,7 @@ public class OrderServiceImpl implements Orderservice {
                 es.setEndTimestamp(DateTimeUtil.parseDate(endDateStr,DateTimeUtil.YYYY_MM_DD_HH_MM_SS).getTime()/1000);
                 es.setPageNum(queryOrderVo.getPageNumber());
                 es.setPageSize(queryOrderVo.getPageSize());
-                OrderConditionsReq queryEs = orderAdapter.convent2QueryOrdersDtoES(es,userId,channelType,queryOrderVo.getQueryOrderStatus(),queryOrderVo.getQueryOrderType());
+                OrderConditionsReq queryEs = orderAdapter.convent2QueryOrdersDtoES(es,userId,channelType,queryOrderVo.getQueryOrderStatus(),queryOrderVo.getQueryOrderType(), queryOrderVo.getQueryPayStatus());
 
                 BaseDownLoadResponse<List<OrderInfoReqs>> response = orderDownLoadSdkService.queryOrderByConditions(queryEs, LogThreadLocal.getTrackingNo());