Merge branch 'feature/20200513_添加购物车校验库存' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java

assortment-ordercenter-sdk/readme.md

@@ -59,4 +59,9 @@
 | 1.6.6-SNAPSHOT | 退单增加配送费字段 | 海波 | 2020-05-12 |
 | 1.6.7-SNAPSHOT | 开放平台订单详情补全信息 | 茹祥 | 2020-05-12 |
 | 1.6.8-SNAPSHOT | 退配送费增加默认值 | 海波 | 2020-05-12 |
-| 1.6.9-SNAPSHOT | 券码接口添加组织机构ID | 胡超 | 2020-05-12 |
\ No newline at end of file
+| 1.6.9-SNAPSHOT | 券码接口添加组织机构ID | 胡超 | 2020-05-12 |
+| 1.3.8.RELEASE | 配送费时间金额 | 胡超 | 2020-05-11 |
+| 1.3.9.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
+| 1.4.0.RELEASE | ES查询优化预约单提醒优化 | 海波 | 2020-05-11 |
+| 1.4.1.RELEASE | 返回储值卡支付订单支付金额 | 李小二 | 2020-05-11 |
+| 1.4.2.RELEASE | 申请退款切取消接口新增超时时间字段 | 伍平 | 2020-05-12 |
\ No newline at end of file

order-application-service/pom.xml

@@ -97,6 +97,11 @@
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>
+            <artifactId>order-management</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.freemud</groupId>
             <artifactId>monitor-tools</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
@@ -323,11 +328,6 @@
             <version>2.5.2-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>cn.freemud</groupId>
-            <artifactId>order-management</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-spring-boot-starter</artifactId>
             <version>2.0.4</version>

ordercenter-sdk/readme.md

@@ -30,4 +30,7 @@
 | 1.4.1-SNAPSHOT | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-07 |
 | 1.2.2.RELEASE | ES查询增加异常单状态 | 李小二 | 2020-04-27 |
 | 1.4.2-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 |
-| 1.4.3-SNAPSHOT | 全单退增加配送费字段 | 海波 | 2020-05-12 |
\ No newline at end of file
+| 1.4.3-SNAPSHOT | 全单退增加配送费字段 | 海波 | 2020-05-12 |
+| 1.2.3.RELEASE | 配送费实际金额 | 胡超 | 2020-05-11 |
+| 1.2.4.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
+| 1.2.5.RELEASE | 取消接口新增超时时间字段 | wuping | 2020-05-12 |
\ No newline at end of file

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

@@ -1272,7 +1272,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         if (availableStocks != null && ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(availableStocks.getCode()) &&
                 (CollectionUtils.isEmpty(availableStocks.getResult()) || availableStocks.getResult().get(0).getQty() == null
-                        || availableStocks.getResult().get(0).getQty() <= qty)) {
+                        || availableStocks.getResult().get(0).getQty() < qty)) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
         }
     }