Merge branch 'hotfix/20200115_商品校验接口失败移除购物车' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

assortment-ordercenter-sdk/readme.md

@@ -16,4 +16,6 @@
 | 1.1.2.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 20200108  |
 | 1.1.3.RELEASE| 1.9.10需求打包release版本（thirdCateId）  | 胡超 | 20200113  |
 | 1.1.4-SNAPSHOT | 订单渠道新增支付宝 | 侯书虎    | 2020-01-09 |
-| 1.1.5-SNAPSHOT | 创建订单新增第三方品类id字段 | 侯书虎    | 2020-01-13 |
\ No newline at end of file
+| 1.1.5-SNAPSHOT | 创建订单新增第三方品类id字段 | 侯书虎    | 2020-01-13 |
+| 1.1.4.RELEASE| 农工商submit接口  | 侯书虎 | 2020-01-13 |
+| 1.1.5.RELEASE| 农工商submit接口(del thirdCateId)  | 胡超 | 2020-01-13 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/entities/OrderExtInfoDTO.java

@@ -75,7 +75,7 @@ public class OrderExtInfoDTO {
     private boolean paidMember;
 
     /**
-     * 异常补退使用
+     * 微信上报异常补推使用
      */
     private String sessionKey;
 }

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

@@ -195,9 +195,6 @@ public class BaseCreateOrderRequest extends BaseConfig {
          * 会员规则ID
          */
         private String ruleId;
-
-        /** 第三方商品分类编号，不必传 */
-        private String thirdCateId;
     }
 
 

assortment-shoppingcart-sdk/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.7.4-SNAPSHOT</version>
+            <version>2.7.4.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -178,6 +178,7 @@ public interface ShoppingCartBaseService {
             ValidateShopProductRequest validateShopProductRequest = shoppingCartAdapter.getValidateShopProductRequest(checkCartRequest);
             com.freemud.application.sdk.api.base.BaseResponse<ValiadShopProductResponse> valiadResponse = productService.validateShopProduct(validateShopProductRequest);
             if (valiadResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(valiadResponse.getCode()) || valiadResponse.getData()==null) {
+                checkCartRequest.getCartGoodsList().forEach(cartGoods -> cartGoods.setCartGoodsUid(null));
                 checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
                 checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
                 return CartResponseUtil.error(valiadResponse.getMessage(),checkCartRequest);

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

@@ -102,4 +102,9 @@ public class OrderExtInfoDto {
      * 扫呗商户号 新支付服务做中转使用
      */
     private String terminalId;
+
+    /**
+     * 微信上报使用的异常补退使用
+     */
+    private String sessionKey;
 }

ordercenter-sdk/readme.md

@@ -8,4 +8,5 @@
 | 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
 | 1.1.1-SNAPSHOT | 创建订单新增部分参数 | 侯书虎   | 2019-12-27 |
 | 1.1.2-SNAPSHOT | 创建订单新增部分参数 | 侯书虎   | 2020-01-03 |
-| 1.1.1.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 2020-01-08  |
\ No newline at end of file
+| 1.1.1.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 2020-01-08  |
+| 1.1.2.RELEASE| 农工商订单submit  | 侯书虎 | 2020-01-13  |
\ No newline at end of file

shopping-cart-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.7.4-SNAPSHOT</version>
+            <version>2.7.4.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>