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

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

@@ -281,6 +281,23 @@ public class ShoppingCartMCoffeeServiceImpl {
                         newCartGoods.add(cartGoods9998);
                     }
                 }
+
+                if(null != shoppingCartGoodsResponseVo.getActivityTip() && CollectionUtils.isNotEmpty(shoppingCartGoodsResponseVo.getActivityTip().getActivityList())) {
+                    Optional<ActivityList> activityListOptional = shoppingCartGoodsResponseVo.getActivityTip().getActivityList().stream().filter(
+                            o -> ActivityTypeEnum.TYPE_230.getCode().equals(o.getTipType())).findFirst();
+                    if(activityListOptional.isPresent()) {
+                        List<CartGoods> cartSendGoodsList = assortmentSdkService.getShoppingCartSendGoods(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService);
+                        if(CollectionUtils.isEmpty(cartSendGoodsList)
+                                || activityListOptional.get().getMcCafeSendGoodsList().stream().noneMatch(o-> o.getSkuId().equals(cartSendGoodsList.get(0).getSkuId()))) {
+                            MCoffeeAddGoodsRequestVo selectGoodsRequest = new MCoffeeAddGoodsRequestVo();
+                            BeanUtils.copyProperties(addShoppingCartGoodsRequestVo, selectGoodsRequest);
+                            selectGoodsRequest.setSkuId(activityListOptional.get().getMcCafeSendGoodsList().get(0).getSkuId());
+                            selectGoodsRequest.setSpuId(activityListOptional.get().getMcCafeSendGoodsList().get(0).getSkuId());
+                            selectSendGoods(selectGoodsRequest);
+                        }
+                    }
+                }
+
                 // 重新保存购物车数据
                 assortmentSdkService.setShoppingCart(partnerId, storeId, userId, newCartGoods, null, tableNumber, this.shoppingCartBaseService);
             }

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

@@ -40,8 +40,8 @@ public class FreightCalculation {
                 activityList.setDeduct(MoneyUtils.parseFen2YuanInt(activityPrompt.getAlreadyDiscountAmount()));
                 activityList.setAgianDeduct(MoneyUtils.parseFen2YuanInt(activityPrompt.getDiscountAmout() - activityPrompt.getAlreadyDiscountAmount()));
                 if(activityPrompt.getThresholdAmount() > activityPrompt.getTotalAmount()) {
-                    activityList.setMissing(MoneyUtils.parseFen2YuanInt(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
-                    activityList.setAgainBuy(MoneyUtils.parseFen2YuanInt(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
+                    activityList.setMissing(MoneyUtils.parseFen2Yuan(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
+                    activityList.setAgainBuy(MoneyUtils.parseFen2Yuan(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
                 } else {
                     activityList.setMissing("0");
                     activityList.setAgainBuy("0");