Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'qa' of…

Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

 Conflicts:
	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -619,6 +619,7 @@ public class OrderSdkAdapter {
         orderConditionsReq.setUserId(queryOrdersRequest.getUserId());
         orderConditionsReq.setPageSize(queryOrdersRequest.getPageSize());
         orderConditionsReq.setPageNum(queryOrdersRequest.getPageNumber());
+        orderConditionsReq.setNeedInvoice(queryOrdersRequest.getNeedInvoice());
 
         List<Integer> orderStatus = new ArrayList<>();
         if (queryOrdersRequest.getStatus() != null && queryOrdersRequest.getStatus().length != 0) {
@@ -1345,6 +1346,7 @@ public class OrderSdkAdapter {
         // 设置 额外拓展字段信息
         OrderExtendedReq orderExtended =  this.getOrderExtendedObj(orderInfoReqs.getOrderExtended());
         data.setOrderExtended(orderExtended);
+        data.setNeedInvoice(orderInfoReqs.getNeedInvoice());
         return data;
     }
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/QueryOrdersRequest.java

@@ -59,4 +59,9 @@ public class QueryOrdersRequest extends BaseConfig {
 
     private List<Integer> bizTypes;
 
+    /**
+     * 是否已开发票，false查询可开票订单，true查询其他订单（包含已开票/已退款订单）
+     */
+    private Boolean needInvoice;
+
 }

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

@@ -1563,6 +1563,8 @@ public class OrderAdapter {
                 responseVo.setUserPhone(orderExtended.getUserPhone());
                 responseVo.setSendWord(orderExtended.getSendWord());
             }
+            //是否已开发票
+            responseVo.setNeedInvoice(orderBean.getNeedInvoice());
             list.add(responseVo);
 //        });
         }

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

@@ -658,4 +658,7 @@ public class QueryOrderResponseVo {
      * 【订单聚合层】总部和区域活动可同时生效 直接反馈促销给的活动数据
      */
     private List<PayGiftCheckAndJoinResponseDtoNew> newPayGift;
+
+    //是否已开票，true已开票，默认false未开票
+    private Boolean needInvoice;
 }

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

@@ -95,4 +95,9 @@ public class QueryOrderVo {
      */
     private Integer marketingType;
 
+    /**
+     * 是否已开发票，false查询可开票订单，true查询其他订单（包含已开票/已退款订单）
+     */
+    private Boolean needInvoice = false;
+
 }

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

@@ -908,6 +908,7 @@ public class OrderServiceImpl implements Orderservice {
             QueryOrdersRequest queryOrdersRequest2 = new QueryOrdersRequest();
             BeanUtil.convertBean(queryOrdersDto, queryOrdersRequest2);
             queryOrdersRequest2.setTrackingNo(LogThreadLocal.getTrackingNo());
+            queryOrdersRequest2.setNeedInvoice(queryOrderVo.getNeedInvoice());
             // 订单要查3个月的，如果查询的订单状态是待取餐、未支付，则查实时，否则，查es
             if (isQueryEs(queryOrderVo.getQueryOrderStatus()) && queryOrderEs) {
                 OrderConditionsReq es = new OrderConditionsReq();
@@ -919,7 +920,7 @@ public class OrderServiceImpl implements Orderservice {
                 es.setPageSize(queryOrderVo.getPageSize());
                 es.setMarketingType(queryOrderVo.getMarketingType());
                 OrderConditionsReq queryEs = orderAdapter.convent2QueryOrdersDtoES(es, userId, channelType, queryOrderVo.getQueryOrderStatus(), queryOrderVo.getQueryOrderType(), queryOrderVo.getQueryPayStatus());
-
+                queryEs.setNeedInvoice(queryOrderVo.getNeedInvoice());
                 BaseDownLoadResponse<List<OrderInfoReqs>> response = orderDownLoadSdkService.queryOrderByConditions(queryEs, LogThreadLocal.getTrackingNo());
 
                 queryOrderResponse = orderAdapter.conventEs2queryOrderResponse(response);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderConditionsReq.java

@@ -138,4 +138,9 @@ public class OrderConditionsReq {
 
     // 快递单号
     private String expressNo;
+
+    /**
+     * 是否已开发票，false查询可开票订单，true查询其他订单（包含已开票/已退款订单）
+     */
+    private Boolean needInvoice;
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderUserConditionsReq.java

@@ -55,4 +55,9 @@ public class OrderUserConditionsReq {
     //订单类型集合
     private List<Integer> bizTypes;
 
+    /**
+     * 是否已开发票，false查询可开票订单，true查询其他订单（包含已开票/已退款订单）
+     */
+    private Boolean needInvoice;
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

@@ -45,12 +45,12 @@ public class OrderInfoReqs {
     /**
      * 是否需要开发票
      */
-    private Boolean needInvoice;
+    private Boolean isNeedInvoice;
 
     /**
      * 是否立即送达
      */
-    private Boolean immediately;
+    private Boolean isImmediately;
 
     /**
      * 取消原因
@@ -204,6 +204,10 @@ public class OrderInfoReqs {
      */
     private BigDecimal actualPayAmount;
 
+    /**
+     * 是否已开票，true已开票，默认false未开票
+     */
+    private Boolean needInvoice;
 
     /**
      * 下单渠道必填，根据此字段的值判断是自营或第三方，来走不同的状态机 详细见 orderClientType枚举
@@ -361,6 +365,10 @@ public class OrderInfoReqs {
 
     private Integer dispenseStatus;
 
+    /**
+     * 是否立即送达
+     */
+    private Boolean immediately;
 
     /**
      * 下游POS商编号