修复商品参与活动,优惠金额的变动,导致商品服务校验商品原价不通过,清空了购物车

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -735,6 +735,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         CouponPromotionVO couponPromotionVO = couponAdapter.getCouponPromotionVO(shoppingCartInfoRequestVo, userLoginInfoDto);
         // fisherman 作用: 调用可选优惠券 计算 配送券是否可用
         couponPromotionVO.setDeliveryAmount(deliveryAmount);
+        // fisherman 是否是v3新算价,
+        boolean v3Promotion = false;
         if (grayPush(partnerId, storeId, "2")) {
             ArrayList<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
             if (StringUtils.isNotEmpty(couponCode)) {
@@ -786,6 +788,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , userId
                     , storeId);
             buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo, calculationSharingDiscountResult, shoppingCartInfoRequestVo.getFlag(), partnerId);
+            if (Objects.nonNull(calculationSharingDiscountResult)) {
+                v3Promotion = calculationSharingDiscountResult.getV3Promotion();
+            }
         } else {
             List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
             // 当couponCode不为空时，需参与价格计算
@@ -821,6 +826,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), partnerId, storeId, userId, ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
             // 在原价、现价、折扣价上增加第一次使用会员卡的费用
             this.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
+            if (Objects.nonNull(calculationDiscountResult)) {
+                v3Promotion = calculationDiscountResult.getV3Promotion();
+            }
         }
         // 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
 //        shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(0L);
@@ -870,7 +878,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         // 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
 
-//        ApiLog.info("fisherman 新算价 校验入参券是否可用new ",shoppingCartGoodsResponseVo,shoppingCartInfoRequestVo.getCouponCodes());
+        if (v3Promotion) {
+            // V3算价,需要删除券的金额,来给前段展示 优惠券的启用门槛
+
+        }
         // 校验入参券是否可用
         if (!checkAvailableCoupon(shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getCouponCode())) {
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_COUPON_NOT_USE);