Merge remote-tracking branch 'remotes/origin/fix_集点不参与积分同享' into qa

# 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/pom.xml

@@ -101,11 +101,6 @@
             <version>1.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.freemud.application.service.sdk</groupId>
-            <artifactId>takeawaycenter-sdk</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

assortment-ordercenter-sdk/readme.md

@@ -2,7 +2,7 @@
 | 版本号        | 版本说明     | 更新人        | 更新时间   |
 | --------------| ------------ | ------------- | ---------- |
 | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
- 1.1.6.SNAPSHOT| 1.9.11商品组  | 胡超 | 2020-02-05 |
+1.1.6.SNAPSHOT| 1.9.11商品组  | 胡超 | 2020-02-05 |
 | 1.1.7.SNAPSHOT| 核销流程更改  | 侯书虎 | 2020-02-10 |
 | 1.5.5-SNAPSHOT | 返回售后单创建时间 | wuping | 2020-04-27 |
 | 1.5.6-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.9.5-SNAPSHOT</version>
+            <version>1.5.12-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>2.10.3-SNAPSHOT</version>
+            <version>2.6.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>
@@ -119,7 +119,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>4.7.6-SNAPSHOT</version>
+            <version>4.6.8.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>
@@ -346,6 +346,7 @@
             <groupId>org.apache.skywalking</groupId>
             <artifactId>apm-toolkit-logback-1.x</artifactId>
         </dependency>
+
     </dependencies>
     <build>
         <plugins>

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

@@ -76,6 +76,7 @@ public class CustomerScoreService implements IPromotionService {
             } else {
                 if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || (calculationDiscountResult != null && calculationDiscountResult.getTotalDiscountAmount().intValue() > 0)
                         || (calculationDiscountResult != null && !CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts()))) {
+                    //是否有换购
                     int type81 = 0;
                     for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount : calculationDiscountResult.getDiscounts()) {
                         if (ActivityTypeEnum.TYPE_81.getCode().equals(discount.getType())) {
@@ -83,9 +84,22 @@ public class CustomerScoreService implements IPromotionService {
                             break;
                         }
                     }
-                    //积分抵扣开关禁用 过滤换购
-                    if (type81 == 0 || (type81 == 1 && !CollectionUtils.isEmpty(shoppingCartInfoRequestVo.getSendGoods()))
-                            || (type81 == 1 && calculationDiscountResult.getDiscounts().size() > 1)) {
+                    //集点
+                    int discountCount = calculationDiscountResult.getDiscounts().size();
+                    int type211 = 0;
+                    for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount : calculationDiscountResult.getDiscounts()) {
+                        if (discount.getType().equals(221)) {
+                            type211 += 1;
+                            break;
+                        }
+                    }
+                    discountCount = discountCount - type211;
+                    //积分抵扣开关禁用 有换购活动 且选中了换购商品
+                    // - 有换购且选中了换购商品
+                    // - 有换购且没有选中换购商品 且除集点以外还有其他促销
+                    if (type81 == 0
+                            || (type81 == 1 && !CollectionUtils.isEmpty(shoppingCartInfoRequestVo.getSendGoods()))
+                            || (type81 == 1 && discountCount > 1)) {
                         customerScoreVo.setScoreReduceState(5);
                         userScoreUseDetail.getResult().setScoreState(5);
                         discountAmount = 0;

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

@@ -416,7 +416,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if ((availableStocks != null) && (ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(availableStocks.getCode()))) {
             if ((CollectionUtils.isEmpty(availableStocks.getResult())) || (qty > availableStocks.getResult().get(0).getQty())) {
                 Integer stock = 0;
-                if ((stock = availableStocks.getResult().get(0).getQty()) > 0) {
+                if (!CollectionUtils.isEmpty(availableStocks.getResult()) && (stock = availableStocks.getResult().get(0).getQty()) > 0) {
                     throw new BizServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE, "仅剩" + stock + "件库存了");
                 }
                 throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
@@ -1219,7 +1219,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 (CollectionUtils.isEmpty(availableStocks.getResult()) || availableStocks.getResult().get(0).getQty() == null
                         || availableStocks.getResult().get(0).getQty() < qty)) {
             Integer stock = 0;
-            if ((stock = availableStocks.getResult().get(0).getQty()) > 0) {
+            if (!CollectionUtils.isEmpty(availableStocks.getResult()) && (stock = availableStocks.getResult().get(0).getQty()) > 0) {
                 throw new BizServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE, "仅剩" + stock + "件库存了");
             }
             throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);