Merge branches 'feature/20200820_哗啦啦产品分类名称_wuping' and 'master' of…

Merge branches 'feature/20200820_哗啦啦产品分类名称_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

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

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

@@ -167,5 +167,7 @@ public class CreateOrderProductRequest extends BaseConfig {
     private Integer stapleFood;
 
     /** 商品统计分类编号**/
-    private String category;
+    private String classificationId;
+
+    private String classificationName;
 }

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

@@ -61,4 +61,9 @@ public class OrderProductAddInfoDto extends BaseConfig {
      * 商品统计分类编号
      */
     private String thirdCensusCategoryId;
+
+    /**
+     * 商品统计分类名称
+     */
+    private String thirdCensusCategoryName;
 }

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

@@ -2019,7 +2019,8 @@ public class OrderAdapter {
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
         createOrderProductDemoDto.setStapleFood(0);
-        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
         return createOrderProductDemoDto;
     }
 

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

@@ -178,7 +178,7 @@ public class ShoppingCartGoodsDto {
         /** 商品统计分类编号**/
         private String classificationId;
 
-        private String setClassificationName;
+        private String classificationName;
         /**
          * 是否限制库存
          * 用于创建订单时，是否扣减库存