Merge branches 'feature/20200604_统计分类编号维护_wuping' and 'master' of…

Merge branches 'feature/20200604_统计分类编号维护_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

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

@@ -2670,7 +2670,9 @@ public class OrderSdkAdapter {
         if (StringUtils.isNotBlank(product.getThirdCategoryId())){
             extInfo.setThirdCategoryId(product.getThirdCategoryId());
         }
-
+        if (StringUtils.isNotBlank(product.getCategory())){
+            extInfo.setThirdCensusCategoryId(product.getCategory());
+        }
         extInfo.setStapleFood(product.getStapleFood());
         //if (product.getStapleFood()!=null && product.getStapleFood()>0) {
         //    extInfo.setStapleFood(1);

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

@@ -161,4 +161,7 @@ public class CreateOrderProductRequest extends BaseConfig {
 
     /** 是否主食**/
     private Integer stapleFood;
+
+    /** 商品统计分类编号**/
+    private String category;
 }

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

@@ -56,4 +56,9 @@ public class OrderProductAddInfoDto extends BaseConfig {
      * 商品绑定的券活动（买券虚拟订单才有）
      */
     private List<ProductBindingCouponType> productBindingCoupons;
+
+    /**
+     * 商品统计分类编号
+     */
+    private String thirdCensusCategoryId;
 }

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

@@ -1903,10 +1903,12 @@ public class OrderAdapter {
         createOrderProductDemoDto.setParentProductId(cartGoodsDetailDto.getParentProductId());
         createOrderProductDemoDto.setIsFixedProduct(cartGoodsDetailDto.getIsFixedProduct());
         createOrderProductDemoDto.setCustomerCode(cartGoodsDetailDto.getCustomerCode());
+        //createOrderProductDemoDto.setProductCode(cartGoodsDetailDto.getProductCode());
         createOrderProductDemoDto.setHasStockProudct(cartGoodsDetailDto.isStockLimit());
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
         createOrderProductDemoDto.setStapleFood(0);
+        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
         return createOrderProductDemoDto;
     }
 

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

@@ -171,6 +171,14 @@ public class ShoppingCartGoodsDto {
          * 三方商品编号
          */
         private String customerCode;
+
+        /**商品货号**/
+//        private String productCode;
+
+        /** 商品统计分类编号**/
+        private String classificationId;
+
+        private String setClassificationName;
         /**
          * 是否限制库存
          * 用于创建订单时，是否扣减库存