合并冲突

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -127,7 +127,15 @@ public interface ShoppingCartBaseService {
     default BaseResponse<List<CouponTypeVo>> getTypeCartCouponCode(CartParamDto cartParamDto, String trackingNo) {
         return null;
     }
-
+    /**
+     * 获取购物车商品代金券
+     *
+     * @param cartParamDto
+     * @return
+     */
+    default BaseResponse<String> getCartCouponCode(CartParamDto cartParamDto, String trackingNo) {
+        return null;
+    }
     /**
      * 清除麦咖啡购物车商品行信息
      *

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -126,6 +126,7 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
          */
         @NotNull
         private Integer qty;
+        private String activityCode;
     }
 
     @Data

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

@@ -62,7 +62,7 @@ public class CouponDiscountCalculation {
     private CouponClient mCoffeeCouponClient;
     @Autowired
     private CouponAdapter couponAdapter;
-//    @Autowired
+    //    @Autowired
 //    private RedisCache redisCache;
 //    @Autowired
 //    private CardBinClient cardBinClient;
@@ -182,11 +182,6 @@ public class CouponDiscountCalculation {
                 continue;
             }
             //商品券商品
-            if (StringUtils.isNotEmpty(cartGoods.getCouponCode()) || discount != null) {
-
-                if (goodsMap.get(cartGoods.getCartGoodsUid()) == null) {
-                    continue;
-                }
             if (StringUtils.isNotEmpty(cartGoods.getCouponCode()) ) {
                 List<ActivityDiscountsDto> productActivityDiscountsDtos = new ArrayList<>();
                 if (CollectionUtils.isNotEmpty(discounts)) {
@@ -207,8 +202,6 @@ public class CouponDiscountCalculation {
                         }
                     }
                 }
-                cartGoods.setCustomerCode(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
-
             }
             cartGoods.setCustomerCode(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
             List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> list = goodsMap.get(cartGoods.getCartGoodsUid()).getDiscounts();