Merge branch 'feature_20200102_1.9.10_thirdCateId' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2.SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.0.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -145,6 +145,11 @@ public class OrderSdkAdapter {
         //订单重量
         Double orderWeight = sumOrderWeight(requestVO.getProducts());
         request.setWeight(orderWeight);
+        // 扩展字段（第三方商品分类编号）
+        if (null != requestVO && null != requestVO.getOtherInfo()) {
+            request.setExtInfo(JSONObject.toJSONString(requestVO.getOtherInfo()));
+        }
+
         return request;
     }
 
@@ -2634,26 +2639,4 @@ public class OrderSdkAdapter {
         return name;
     }
 
-    /**
-     * 计算所有商品的重量 单位g
-     */
-    private Double sumOrderWeight(List<CreateOrderProductRequest> products) {
-        Double totalWeight = 0D;
-        if (CollectionUtils.isEmpty(products)) {
-            return totalWeight;
-        }
-        for (CreateOrderProductRequest productRequest : products) {
-            if (ObjectUtils.equals(ProductTypeEnum.SETMEAL_PRODUCT.getCode(), productRequest.getProductType()) || ObjectUtils.equals(ProductTypeEnum.SETMEAL_UPPRICE_PRODUCT.getCode(), productRequest.getProductType())) {
-                if (CollectionUtils.isNotEmpty(productRequest.getComboProduct())) {
-                    Double comboProductTotalWeight = productRequest.getComboProduct().stream().map(t -> t.getWeight() == null ? 0D : t.getWeight()).reduce(0D, Double::sum);
-                    totalWeight += comboProductTotalWeight;
-                }
-            } else {
-                Double productWeight = productRequest.getWeight() == null ? 0D : productRequest.getWeight();
-                totalWeight += productWeight;
-            }
-        }
-        return totalWeight;
-    }
-
 }

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

@@ -189,6 +189,9 @@ public class BaseCreateOrderRequest extends BaseConfig {
          * 会员规则ID
          */
         private String ruleId;
+
+        /** 第三方商品分类编号，不必传 */
+        private String thirdCateId;
     }