Merge remote-tracking branch 'origin/develop' into develop

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.0.13-SNAPSHOT</version>
+    <version>2.0.14-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -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/readme.md

@@ -81,4 +81,5 @@
 | 2.0.9-SNAPSHOT| 新增修改取餐码接口| 谌会阳 |2020-08-08
 | 2.0.11-SNAPSHOT| 麦咖啡| 谌会阳 |2020-08-08
 | 2.0.12-SNAPSHOT| OrderSourceType 调整 | 谌会阳 |2020-08-10
-| 2.0.13-SNAPSHOT| 加料商品 | 谌会阳 |2020-08-14
+| 2.0.13-SNAPSHOT| 加料商品 | 谌会阳 |2020-08-14
\ No newline at end of file
+| 2.0.14-SNAPSHOT| 商品统计分类名称保存 | wuping | 2020-08-20 |
\ No newline at end of file

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;
+    
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -5,6 +5,7 @@ import cn.freemud.amqp.MQAction;
 import cn.freemud.amqp.MQMessage;
 import cn.freemud.amqp.MQService;
 import cn.freemud.base.util.DateUtil;
+import cn.freemud.base.util.JsonUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
@@ -70,6 +71,8 @@ import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.vo.AssortmentOrderProductVo;
 import com.google.gson.Gson;
+import com.mysql.jdbc.log.LogUtils;
+import lombok.extern.log4j.Log4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -242,7 +245,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             CouponLockRequest couponLockRequest = orderSdkAdapter.convert2CouponLockRequest(orderBean, accounts);
             if (couponLockRequest != null) {
                 BaseResponse<CouponLockResponse> couponLockResponseBaseResponse = offlineCouponSdkService.couponLock(couponLockRequest, "");
-                if (!ObjectUtils.equals(RESPONSE_SUCCESS, couponLockResponseBaseResponse.getStatusCode())) {
+                if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponLockResponseBaseResponse.getCode())) {
                     CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null);
                     orderCancel(cancelOrderRequest);
                     //失败异步冲正库存，取消订单

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,12 +35,12 @@
         <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>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.13-SNAPSHOT</version>
+            <version>2.0.14-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -2102,7 +2102,8 @@ public class OrderAdapter {
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
         createOrderProductDemoDto.setStapleFood(0);
-        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setSetClassificationName(cartGoodsDetailDto.getSetClassificationName());
         if (CollectionUtils.isNotEmpty(cartGoodsDetailDto.getActivityDiscountsDtos())) {
             createOrderProductDemoDto.setAccounts(getMaterialAccounts(createOrderProductDemoDto, cartGoodsDetailDto));
         }
@@ -2131,9 +2132,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);
     }