添加日志 获取优惠信息

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

shopping-cart-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java

@@ -552,28 +552,16 @@ public class CouponAdapter {
         couponPromotionVO.setPartnerId(shoppingCartInfoRequestVo.getPartnerId());
         couponPromotionVO.setUserId(userLoginInfoDto.getMemberId());
         couponPromotionVO.setStoreId(shoppingCartInfoRequestVo.getShopId());
-        // 删除配送券-> 商品券使用逻辑组装
+        // 删除配送券-> 商品券使用逻辑组装  fisherman购物车配送券组装
         String couponCode1 = shoppingCartInfoRequestVo.getCouponCode();
-        if (Objects.isNull(couponCode1)) {
-            List<ShoppingCartInfoRequestVo.couponCode> couponCodes = shoppingCartInfoRequestVo.getCouponCodes();
-            if (CollectionUtils.isEmpty(couponCodes)) {
-                couponPromotionVO.setCouponCode("");
-            }else {
-                // 把所有的券信息装入 set中 用于可选优惠券判断
-                Set<String > setCoupons = new HashSet<>();
-                couponCodes.forEach(c -> setCoupons.add(c.getCouponCode()));
-                couponPromotionVO.setCouponCodes(setCoupons);
-                ShoppingCartInfoRequestVo.couponCode otherCouponCode = couponCodes.stream()
-                        .filter(couponCode -> !couponCode.getCouponType().equals(CouponTypeEnum.TYPE_5.getCode()))
-                        // 只能使用一张券 排除配送券情况下
-                        .findFirst().orElse(null);
-                if (otherCouponCode !=null) {
-                    couponPromotionVO.setCouponCode(otherCouponCode.getCouponCode());
-                }else {
-                    couponPromotionVO.setCouponCode("");
-                }
-            }
-        }else {
+        List<ShoppingCartInfoRequestVo.couponCode> couponCodes = shoppingCartInfoRequestVo.getCouponCodes();
+        if(CollectionUtils.isNotEmpty(couponCodes)){
+            Set<String > setCoupons = new HashSet<>();
+            couponCodes.forEach(c -> setCoupons.add(c.getCouponCode()));
+            couponPromotionVO.setCouponCodes(setCoupons);
+        }
+        // 兼容老版本
+        if(!Objects.isNull(couponCode1)){
             couponPromotionVO.setCouponCode(couponCode1);
         }
 

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

@@ -11,6 +11,7 @@ import cn.freemud.enums.CouponFlag;
 import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.service.CouponService;
 import cn.freemud.service.IPromotionService;
+import cn.freemud.utils.LogUtil;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
 import com.google.common.collect.Lists;
@@ -189,6 +190,7 @@ public class CouponPromotionService implements IPromotionService {
 
     @Override
     public void updateShoppingCartGoodsApportion(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
+        // 这里存放优惠券的信息  下面用于存放
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponDiscounts = calculationDiscountResult == null ? new ArrayList<>() : calculationDiscountResult.getCouponDiscounts();
         List<ActivityDiscountsDto> activityDiscountsDtos = shoppingCartGoodsDto.getActivityDiscountsDtos() == null ? new ArrayList<>() : shoppingCartGoodsDto.getActivityDiscountsDtos();
 
@@ -208,13 +210,15 @@ public class CouponPromotionService implements IPromotionService {
                 }
             }
         }
-
+        // fisherman 获取优惠券的信息 存放入 setActivityDiscountsDtos
         for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponDiscount : couponDiscounts) {
             ActivityDiscountsDto activityDiscountsDto = getActivityDiscountDto(calculationDiscountResult.getApportionGoods(), couponDiscount);
             if (activityDiscountsDto != null) {
                 activityDiscountsDtos.add(activityDiscountsDto);
             }
         }
+        LogUtil.info("fisherman 获取优惠券的信息 存放入 setActivityDiscountsDtos ---",calculationDiscountResult,activityDiscountsDtos);
+        // fisherman activityDiscountsDtos 设置 用于存放 settlement表
         shoppingCartGoodsDto.setActivityDiscountsDtos(activityDiscountsDtos);
     }
 

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

@@ -994,6 +994,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         String activityCode = shoppingCartInfoRequestVo.getActivityCode();
         List<ShoppingCartInfoRequestVo.couponCode> couponCodes = shoppingCartInfoRequestVo.getCouponCodes();
         if (Objects.isNull(couponCode) && CollectionUtils.isNotEmpty(couponCodes)) {
+            // fisherman 这里可能会有问题 如果只有配送券的情况下 这里 过滤掉了 得检查后面的逻辑 是否用了list去做事情
             ShoppingCartInfoRequestVo.couponCode otherCouponCode = couponCodes.stream()
                     .filter(couponCode1 -> couponCode1.getCouponType()!=null && couponCode1.getCouponType().compareTo(CouponTypeEnum.TYPE_5.getCode())!=0)
                     .findFirst().orElse(null);