Merge remote-tracking branch 'remotes/origin/feature/套餐固定商品主食标识_1.9.19' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.9.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.1.9-SNAPSHOT</version>
+            <version>1.1.9.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -23,3 +23,4 @@
 | 1.2.5.RELEASE | 满额减配送费 | dingkai | 2020-03-26 |
 | 1.2.5.RELEASE | 满额减配送费 | 海波 | 2020-03-26 |
 | 1.2.7.RELEASE | 判断优化 | 丁凯 | 2020-04-03 |
+| 1.2.8.RELEASE | 增加延时队列 | 海波 | 2020-04-13 |
\ No newline at end of file

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

@@ -2528,6 +2528,11 @@ public class OrderSdkAdapter {
         if (StringUtils.isNotBlank(product.getThirdCategoryId())){
             extInfo.setThirdCategoryId(product.getThirdCategoryId());
         }
+
+        extInfo.setStapleFood(product.getStapleFood());
+        //if (product.getStapleFood()!=null && product.getStapleFood()>0) {
+        //    extInfo.setStapleFood(1);
+        //}
         // todo 订单行扩展字段商品组
         extInfo.setProductGroupList(product.getProductGroupList());
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/AutoOrderConfigTime.java

@@ -18,7 +18,9 @@ public enum AutoOrderConfigTime {
     half_hour("3",30),
     fifteen_minutes("4",15),
     ten_minutes("5",10),
-    five_minutes("6",5)
+    five_minutes("6",5),
+    three_minutes("7",3),
+    two_minutes("8",2)
     ;
     private String type;
     private Integer time;

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

@@ -158,4 +158,7 @@ public class CreateOrderProductRequest extends BaseConfig {
 
     /** 商品组 **/
     private List<ProductGroupVo> productGroupList;
+
+    /** 是否主食**/
+    private Integer stapleFood;
 }

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

@@ -48,4 +48,7 @@ public class OrderProductAddInfoDto extends BaseConfig {
 
     /** 商品组 **/
     private List<ProductGroupVo> productGroupList;
+
+    /** 是否主食 **/
+    private Integer stapleFood;
 }

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.4.4-SNAPSHOT</version>
+            <version>1.2.9.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -84,11 +84,6 @@
             <artifactId>deliverycenter-sdk</artifactId>
             <version>1.5.RELEASE</version>
         </dependency>
-        <dependency>
-            <groupId>com.freemud.application.service.sdk</groupId>
-            <artifactId>takeawaycenter-sdk</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
-        </dependency>
         <!--  商户门店sdk  -->
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -119,7 +114,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>4.4.4-SNAPSHOT</version>
+            <version>4.3.0.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>

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

@@ -1939,6 +1939,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setHasStockProudct(cartGoodsDetailDto.isStockLimit());
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
+        createOrderProductDemoDto.setStapleFood(0);
         return createOrderProductDemoDto;
     }
 

order-application-service/src/main/java/cn/freemud/entities/dto/ProductComboListDto.java

@@ -39,6 +39,8 @@ public class ProductComboListDto {
     private Integer status;
     private Integer stockLimit;
     private String unit;
+    /* 是否主食*/
+    private Integer stapleFood;
     protected List<ProductAttributeGroup> productAttributeGroupList;
 
 }

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

@@ -52,4 +52,8 @@ public class GetProductsVo {
     /** 商品组 */
     private List<ProductGroup> productGroupList;
 
+    /*
+     * 是否主食
+     */
+    private Integer stapleFood;
 }

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

@@ -128,15 +128,20 @@ public class ItemServiceImpl implements ItemService{
      */
     private void saveComboProductsThirdInfo(ProductInfo productBean,Map<String, GetProductsVo> resultMap){
         GetProductsVo spuProductsVo = resultMap.get(productBean.getPid());
+        List<Integer> stapleFood = Arrays.asList(0, 1);
         //套餐固定商品
         if (CollectionUtils.isNotEmpty(productBean.getProductComboList())) {
             for (ProductComboListDto productComboListDto : productBean.getProductComboList()) {
                 GetProductsVo comboProductsVo = new GetProductsVo();
                 comboProductsVo.setCustomerCode(productComboListDto.getCustomerCode());
                 comboProductsVo.setProductCode(productComboListDto.getProductCode());
+                if (productComboListDto.getStapleFood()!=null && stapleFood.contains(productComboListDto.getStapleFood())) {
+                    comboProductsVo.setStapleFood(productComboListDto.getStapleFood());
+                } else {
+                    comboProductsVo.setStapleFood(0);
+                }
                 //第三方商品属性信息
                 comboProductsVo.setProductAttributeGroupList(productComboListDto.getProductAttributeGroupList());
-
                 if(CollectionUtils.isNotEmpty(spuProductsVo.getProductGroupList())){
                     /** 商品组 */
                     for(ProductGroup group : spuProductsVo.getProductGroupList()){

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.1.9.RELEASE</version>
+    <version>1.2.0.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -14,3 +14,4 @@
 | 1.1.8-SNAPSHOT | 预约单接单接口增加预约任务 | wuping | 2020-03-17 |
 | 1.1.8.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
 | 1.1.9.RELEASE | 满额减配送费RELEASE | dingkai | 2020-03-26 |
+| 1.2.0.RELEASE | 新增订单商品汇总下载接口 | 侯书虎 | 2020-04-07 |

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java

@@ -63,6 +63,8 @@ public class InterfaceAddressConstant {
     public static final String QUERY_ORDER_BY_CONDITIONS = "order/v2/queryOrderByConditions";
     //下载
     public static final String QUERY_ORDER_BY_SCROLL = "/order/v2/queryOrderByScroll";
+    //下载
+    public static final String QUERY_ORDER_ITEM_STATISTICS = "/order/v2/queryOrderItemSales";
 
     //修改订单配送信息
     public static final String UPDATE_DELIVERY_INFO = "order/v2/updateDeliveryInfo";

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

+package com.freemud.application.sdk.api.ordercenter.response;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: OrderItemStatisticsResponse
+ * @Package com.freemud.application.sdk.api.ordercenter.response
+ * @Description:
+ * @author: shuhu.hou
+ * @date: 2020/4/7 16:21
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class OrderItemStatisticsResponse {
+    /**
+     * 商品
+     * 组合：productName + "#split#" + productId + "#split#" +productSpecName+ "#split#"+productProperty;
+     * 值：[多规格一维lulu]#split#[159339992708028675]#split#[多规格一维lulu/微辣]#split#[002之小类2/超级辣，变态辣！！]
+     */
+    private String aggsName;
+    /**
+     * 统计数量
+     */
+    private Double aggsSum;
+
+
+    /**
+     * 商品名称
+     */
+    public String getProductName() {
+        return aggsName.split("#split#")[0].replace("[", "").replace("]", "");
+    }
+
+    /**
+     * 商品编号
+     */
+    public String getProductId() {
+        return aggsName.split("#split#")[1].replace("[", "").replace("]", "");
+    }
+
+    /**
+     * 商品规格
+     */
+    public String getProductSpecName() {
+        return aggsName.split("#split#")[2].replace("[", "").replace("]", "");
+    }
+
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderDownLoadSdkService.java

@@ -10,6 +10,7 @@ import com.freemud.application.sdk.api.ordercenter.request.QueryAfterSalesOrderC
 import com.freemud.application.sdk.api.ordercenter.request.QueryOrderByScrollRequest;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
 import com.freemud.application.sdk.api.ordercenter.response.AfterSalesListResp;
+import com.freemud.application.sdk.api.ordercenter.response.OrderItemStatisticsResponse;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
@@ -68,6 +69,15 @@ public class OrderDownLoadSdkService {
         return responseHandle(responseDTO);
     }
 
+    public BaseDownLoadResponse<List<OrderItemStatisticsResponse>> queryOrderItemStatistics(OrderConditionsReq request) {
+        long begin = System.currentTimeMillis();
+        BaseDownLoadResponse<List<OrderItemStatisticsResponse>> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexDownLoad(restTemplate, InterfaceAddressConstant.QUERY_ORDER_ITEM_STATISTICS,
+                createBaseRequest(request, ""), new ParameterizedTypeReference<BaseDownLoadResponse<List<OrderItemStatisticsResponse>>>() {
+                });
+        ThirdPartyLog.infoConvertJson(begin, System.currentTimeMillis(), InterfaceAddressConstant.QUERY_ORDER_BY_SCROLL, request, responseMini(responseDTO));
+        return responseDTO;
+    }
+
     /**
      * 分页查询售后单
      *