Merge branches 'develop' and 'feature/20200506_取餐时间调整_wuping' of…

Merge branches 'develop' and 'feature/20200506_取餐时间调整_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/readme.md

assortment-ordercenter-sdk/readme.md

@@ -69,4 +69,5 @@
 | 1.7.2-SNAPSHOT| 规范extInfo字段 | 侯书虎 | 2020-05-14 |
 | 1.7.3-SNAPSHOT| 客如云 | 海波 | 2020-05-14 |
 | 1.7.4-SNAPSHOT| 客如云 | 海波 | 2020-05-15 |
-| 1.7.6-SNAPSHOT| 订单查询返回配送渠道字段 | 雷后领 | 2020-05-15 |
+| 1.7.6-SNAPSHOT| 订单查询返回配送渠道字段 | 雷后领 | 2020-05-15 |
\ No newline at end of file
+| 1.7.7-SNAPSHOT| 聚合订单综合查询新增新订单类型  | wuping | 2020-05-15 |

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

@@ -877,11 +877,13 @@ public class OrderSdkAdapter {
     public QueryOrdersResponse.DataBean.OrderBean convent2NEWOrderInfo(OrderInfoReqs orderInfoReqs) {
         QueryOrdersResponse.DataBean.OrderBean data = new QueryOrdersResponse.DataBean.OrderBean();
 
+        data.setOrderClient(orderInfoReqs.getOrderClient().toString());
         data.setCompanyId(orderInfoReqs.getPartnerId());
         data.setShopId(orderInfoReqs.getStoreId());
         data.setShopName(orderInfoReqs.getStoreName());
         data.setOid(orderInfoReqs.getOrderCode());
         data.setOrderType(getOldOrderType(orderInfoReqs.getOrderType()));
+        data.setNewOrderType(orderInfoReqs.getOrderType());
         data.setAmount(orderInfoReqs.getSettlementAmount() == null ? 0L : orderInfoReqs.getSettlementAmount().longValue());
         data.setSettlementAmount(orderInfoReqs.getSettlementAmount() == null ? 0L : orderInfoReqs.getSettlementAmount().longValue());
         data.setActualPayAmount(orderInfoReqs.getActualPayAmount() == null ? 0L : orderInfoReqs.getActualPayAmount().longValue());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -165,8 +165,15 @@ public class QueryOrdersResponse {
              * 订单ID
              */
             private String oid;
+            /**
+             * 老版本订单类型
+             */
             private Integer orderType;
             /**
+             * 新订单服务订单类型
+             */
+            private Integer newOrderType;
+            /**
              * 取餐码
              */
             private String otherCode;