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

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1624,6 +1624,9 @@ public class OrderSdkAdapter {
         activityUpdateStockRequest.setPartnerCode(orderBean.getCompanyId());
         activityUpdateStockRequest.setStoreId(orderBean.getShopId());
         activityUpdateStockRequest.setVer("1");
+        // add by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+        activityUpdateStockRequest.setUserId(orderBean.getUserId());
+        activityUpdateStockRequest.setOrderCreateTime(DateUtil.getCurrentDate(DateUtil.FORMAT_yyyyMMdd_date));
         return activityUpdateStockRequest;
     }
 

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.2.2-SNAPSHOT</version>
+            <version>2.2.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -70,7 +70,7 @@ public class GatherSpotPromotionService implements IPromotionService {
         }
 
         // 活动类型-TYPE_221筛选出集点活动
-        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> gatherSpots = calculationDiscountResult.getDiscounts().stream().filter(activityPrompt -> ActivityTypeEnum.TYPE_221.getCode().intValue() == activityPrompt.getType().intValue()).collect(Collectors.toList());
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> gatherSpots = calculationDiscountResult.getDiscounts().stream().filter(activityPrompt -> null != activityPrompt.getType() && ActivityTypeEnum.TYPE_221.getCode().intValue() == activityPrompt.getType().intValue()).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(gatherSpots)) {
             return;
         }

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

@@ -86,9 +86,9 @@ public class SetMealCalculation {
 
             cartGoods.setOriginalAmount(productGroupTotalAmount + productComboTotalAmount + materialPrice);
             cartGoods.setOriginalPrice(productComboTotalAmount);
-            Long amount = null != cartGoods.getAmount() ? cartGoods.getAmount() + productComboTotalAmount + materialPrice :
-                    productGroupTotalAmount + productComboTotalAmount + materialPrice;
-            cartGoods.setAmount(amount);
+//            Long amount = null != cartGoods.getAmount() ? cartGoods.getAmount() + productComboTotalAmount + materialPrice :
+//                    productGroupTotalAmount + productComboTotalAmount + materialPrice;
+            cartGoods.setAmount(productGroupTotalAmount + productComboTotalAmount + materialPrice);
             cartGoods.setFinalPrice(productComboTotalAmount);
 
             // 套餐（固定商品）现价