更新操作

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

@@ -20,6 +20,7 @@ import cn.freemud.service.CouponService;
 import cn.freemud.service.impl.AssortmentSdkService;
 import cn.freemud.service.impl.CouponServiceImpl;
 import cn.freemud.service.impl.FullSubtractionActivityServiceImpl;
+import cn.freemud.service.impl.mcoffee.calculation.BuySendCalculation;
 import cn.freemud.service.impl.mcoffee.calculation.CalculationServiceImpl;
 import cn.freemud.service.impl.mcoffee.calculation.CouponDiscountCalculation;
 import cn.freemud.service.impl.mcoffee.entity.CopyShoppingCartRequestVo;
@@ -115,6 +116,8 @@ public class ShoppingCartMCoffeeServiceImpl {
     private ProductClient productClient;
     @Autowired
     private ShoppingCartConvertAdapter shoppingCartConvertAdapter;
+    @Autowired
+    private BuySendCalculation buySendCalculation;
 
     private static final String nullSeat = "508106";
 
@@ -249,8 +252,8 @@ public class ShoppingCartMCoffeeServiceImpl {
                                 || 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());
+                            selectGoodsRequest.setSkuId(activityListOptional.get().getMcCafeSendGoodsList().get(0).getGoodsId());
+                            selectGoodsRequest.setSpuId(activityListOptional.get().getMcCafeSendGoodsList().get(0).getGoodsId());
                             selectGoodsRequest.setOperationType(1);
                             selectSendGoods(selectGoodsRequest);
                         }
@@ -671,9 +674,30 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 当couponCode不为空时，需参与价格计算
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,freightCouponCode,null);
         // 促销活动的优惠金额计算
-        calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, couponCode,
+        ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscount = calculationService.updateShoppingCartGoodsDiscount(
+                partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, couponCode,
                 cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null, cartSendGoodsList);
 
+        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> finalCartSendGoodsList = new ArrayList<>();
+                finalCartSendGoodsList.addAll(cartSendGoodsList);
+                if(CollectionUtils.isEmpty(cartSendGoodsList)
+                        || activityListOptional.get().getMcCafeSendGoodsList().stream().noneMatch(o-> o.getSkuId().equals(finalCartSendGoodsList.get(0).getSkuId()))) {
+                    MCoffeeAddGoodsRequestVo selectGoodsRequest = new MCoffeeAddGoodsRequestVo();
+                    BeanUtils.copyProperties(updateShoppingCartGoodsQtyRequestVo, selectGoodsRequest);
+                    selectGoodsRequest.setSkuId(activityListOptional.get().getMcCafeSendGoodsList().get(0).getGoodsId());
+                    selectGoodsRequest.setSpuId(activityListOptional.get().getMcCafeSendGoodsList().get(0).getGoodsId());
+                    selectGoodsRequest.setOperationType(1);
+                    selectSendGoods(selectGoodsRequest);
+                    cartSendGoodsList = assortmentSdkService.getShoppingCartSendGoods(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService);
+                    buySendCalculation.updateBuySendActivityTip(calculationDiscount, shoppingCartGoodsResponseVo, cartSendGoodsList);
+                }
+            }
+        }
+
         //把月卡放到最后
         if (CollectionUtils.isNotEmpty(cartGoodsList)) {
             int size = cartGoodsList.size();