Merge branch 'feature/20201112_优惠为0的券也要核销_xukang' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
#	ordercenter-sdk/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -61,7 +61,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.6.5.SNAPSHOT</version>
+            <version>2.7.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-ordercenter-sdk/readme.md

@@ -80,3 +80,4 @@
 | 2.0.14-RELEASE | 集点推送改造 | 徐康 | 2020-10-28 |
 | 2.0.15.RELEASE | 麦咖啡加料 | 徐康 | 2020-10-30 |
 | 2.0.16.RELEASE | 麦咖啡问题修复 | 徐康 | 2020-11-09 |
+| 2.1.2.RELEASE | 活动扣减库存 | 缪晖 | 2020-11-11 |

order-application-service/pom.xml

@@ -60,7 +60,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.6.5.SNAPSHOT</version>
+            <version>2.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>

order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

@@ -151,12 +151,10 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             }
             return orderService.createOrderNew(createOrderVo);
         } catch (Exception e) {
-            log.error("创建订单失败,trackingNo:{}", LogTreadLocal.getTrackingNo());
+            throw e;
         } finally {
             //LockUtils.unlock(redisCache.getRedisTemplate(),createOrderKey);
         }
-
-        return ResponseUtil.error(ResponseResult.ORDER_CREATE_ERROR);
     }
 
 

order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java

@@ -79,7 +79,6 @@ public class CouponClientServiceImpl implements CouponClientService {
                         ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.PRODUCT_COUPON)
                         ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON)
                         ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.FREIGHT_COUPON))
-                        && !withOrderBuyCouponCode.equals(account.getAccountId())
                         ).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList)) {
             return null;
@@ -151,8 +150,7 @@ public class CouponClientServiceImpl implements CouponClientService {
                 account -> (OldOrderAccountType.PRODUCT_COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
                         || OldOrderAccountType.COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
                         || OldOrderAccountType.DISCOUNT_COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
-                        || OldOrderAccountType.FREIGHT_COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
-                        ) && !withOrderBuyCouponCode.equals(account.getAccountId())).collect(Collectors.toList());
+                        )).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList)) {
             return null;
         }

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.16.RELEASE</version>
+            <version>2.1.2-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -205,7 +205,7 @@ public class CalculationServiceImpl {
         for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount : discounts) {
             int discountAmount = (discount.getDiscount() == null) ? 0 : discount.getDiscount();
             Integer discountType = discount.getType();
-            if (discountType != null && discountAmount > 0) {
+            if (discountType != null && discountAmount >= 0) {
                 ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
                 activityDiscountsDto.setActivityCode(discount.getActivityCode());
                 activityDiscountsDto.setActivityName(discount.getActivityName());