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

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

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

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

@@ -2597,8 +2597,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.setThirdCensusCategoryId(product.getSetClassificationName());
         }
         if (0 != product.getTax()){
             extInfo.setTax(product.getTax());

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

@@ -166,11 +166,13 @@ public class CreateOrderProductRequest extends BaseConfig {
     /** 是否主食**/
     private Integer stapleFood;
 
-    /** 商品统计分类编号**/
-    private String category;
-
     /** 商品税率**/
     private double tax;
 
     private String taxId;
+
+    /** 商品统计分类编号**/
+    private String classificationId;
+
+    private String setClassificationName;
 }

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

@@ -65,4 +65,9 @@ public class OrderProductAddInfoDto extends BaseConfig {
     private double tax;
 
     private String taxId;
+
+    /**
+     * 商品统计分类名称
+     */
+    private String thirdCensusCategoryName;
 }

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

@@ -2136,9 +2136,10 @@ public class OrderAdapter {
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
         createOrderProductDemoDto.setStapleFood(0);
-        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
         createOrderProductDemoDto.setTax(cartGoodsDetailDto.getTax());
         createOrderProductDemoDto.setTaxId(cartGoodsDetailDto.getTaxId());
+        createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setSetClassificationName(cartGoodsDetailDto.getSetClassificationName());
         return createOrderProductDemoDto;
     }