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

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

# 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
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java

assortment-ordercenter-sdk/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>1.11.0-SNAPSHOT</version>
+            <version>1.10.2.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -2596,8 +2596,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

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

call-back-service/src/main/resources/application-pro.properties

@@ -8,4 +8,4 @@ app.id=SHOP_OPEN_STORE
 apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080
 env=pro
 apollo.bootstrap.enabled=true
-apollo.bootstrap.namespaces=micro_progeram_commons,i_callback_service
+apollo.bootstrap.namespaces=i_callback_service,micro_progeram_commons
\ No newline at end of file

order-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>1.11.0-SNAPSHOT</version>
+            <version>1.10.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

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

@@ -2131,9 +2131,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;
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/ShoppingCartApplication.java

@@ -13,6 +13,7 @@
 package cn.freemud;
 
 import cn.freemud.core.db.DataSourcesConfig;
+import com.alibaba.fastjson.parser.ParserConfig;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import feign.RequestInterceptor;
 import org.jasypt.encryption.StringEncryptor;
@@ -48,6 +49,7 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableAsync
 public class ShoppingCartApplication {
     public static void main(String[] args) {
+        ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
         SpringApplication.run(ShoppingCartApplication.class, args);
     }