兼容老版本 couponcode

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

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

@@ -540,10 +540,6 @@ public class CouponServiceImpl implements CouponService {
     private ActivityClassifyCouponBean returnSuccessAvailiableCoupons(String couponCode, boolean hasGoodsCoupon, ActivityClassifyCouponBean availableCouponResponseVo, List<ActivityCouponBean> usableCoupons,
                                                                       List<ActivityCouponBean> disableCoupons, Map<String, GetMemberCouponListResponseDto.Result.MemberCoupon> memberCouponMap,
                                                                       List<CouponStateVo> couponStateList, String chooseCouponCode) {
-        LogUtil.info("配送券-0--",couponCode,hasGoodsCoupon);
-        LogUtil.info("配送券-1--",availableCouponResponseVo,usableCoupons);
-        LogUtil.info("配送券-3--",disableCoupons,memberCouponMap);
-        LogUtil.info("配送券-4--",couponStateList,chooseCouponCode);
         int disableCouponNum = 0;
         int usableCouponNum = 0;
         for (CouponStateVo couponStateVo : couponStateList) {

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

@@ -433,17 +433,21 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         String partnerId = shoppingCartInfoRequestVo.getPartnerId();
         String storeId = shoppingCartInfoRequestVo.getShopId();
         String appId = shoppingCartInfoRequestVo.getAppId();
+        String couponCode = shoppingCartInfoRequestVo.getCouponCode();
+        String activityCode = shoppingCartInfoRequestVo.getActivityCode();
         List<ShoppingCartInfoRequestVo.couponCode> couponCodes = shoppingCartInfoRequestVo.getCouponCodes();
-        if (!CollectionUtils.isEmpty(couponCodes)) {
+        // 兼容老版本
+        if (CollectionUtils.isNotEmpty(couponCodes) && StringUtils.isEmpty(couponCode)) {
             ShoppingCartInfoRequestVo.couponCode otherCouponCode = couponCodes.stream()
-                    .filter(couponCode -> !couponCode.getCouponType().equals(CouponTypeEnum.TYPE_5.getCode()))
+                    .filter(couponCode1 -> couponCode1.getCouponType()!=null && couponCode1.getCouponType().compareTo(CouponTypeEnum.TYPE_5.getCode()) != 0)
                     .findFirst().orElse(null);
-            if (otherCouponCode !=null) {
+            if (otherCouponCode != null) {
                 // 由于对下面逻辑 不是很清楚 并且修改了 优惠券传参规则 所以直接设置一遍 防止出错
                 shoppingCartInfoRequestVo.setCouponCode(otherCouponCode.getCouponCode());
                 shoppingCartInfoRequestVo.setActivityCode(otherCouponCode.getActivityCode());
             }
         }
+
         String menuType = shoppingCartInfoRequestVo.getMenuType();
         Integer orderType = shoppingCartInfoRequestVo.getOrderType();
         String receiveId = shoppingCartInfoRequestVo.getReceiveId();
@@ -495,20 +499,22 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         // 下面代码 由于接口改动 已经不适用 begin
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
         // 当couponCode不为空时，需参与价格计算
-//        if (StringUtils.isNotEmpty(couponCode)) {
-//            ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
-//            coupon.setCode(couponCode);
-//            coupon.setActivityCode(activityCode);
-//            coupons.add(coupon);
-//        }
+        if (StringUtils.isNotEmpty(couponCode)) {
+            ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
+            coupon.setCode(couponCode);
+            coupon.setActivityCode(activityCode);
+            coupons.add(coupon);
+        }
         // 上面代码 由于接口改动 已经不适用 end
         if (!CollectionUtils.isEmpty(couponCodes)) {
             couponCodes.forEach(shoppingCouponCode -> {
+                if (!shoppingCouponCode.getCouponCode().equals(couponCode)) {
                     ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
                     coupon.setCode(shoppingCouponCode.getCouponCode());
                     coupon.setActivityCode(shoppingCouponCode.getActivityCode());
                     coupon.setCouponType(shoppingCouponCode.getCouponType());
                     coupons.add(coupon);
+                }
             });
         }
 

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

@@ -363,17 +363,21 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         String storeId = this.getBindMallShopId(appId);
         shoppingCartInfoRequestVo.setShopId(storeId);
         List<CartGoods> cartGoodsList = new ArrayList<>();
+        String couponCode = shoppingCartInfoRequestVo.getCouponCode();
+        String activityCode = shoppingCartInfoRequestVo.getActivityCode();
         List<ShoppingCartInfoRequestVo.couponCode> couponCodes = shoppingCartInfoRequestVo.getCouponCodes();
-        if (!CollectionUtils.isEmpty(couponCodes)) {
+        // 兼容老版本
+        if (CollectionUtils.isNotEmpty(couponCodes) && StringUtils.isEmpty(couponCode)) {
             ShoppingCartInfoRequestVo.couponCode otherCouponCode = couponCodes.stream()
-                    .filter(couponCode -> !couponCode.getCouponType().equals(CouponTypeEnum.TYPE_5.getCode()))
+                    .filter(couponCode1 -> couponCode1.getCouponType()!=null && couponCode1.getCouponType().compareTo(CouponTypeEnum.TYPE_5.getCode()) != 0)
                     .findFirst().orElse(null);
-            if (otherCouponCode !=null) {
+            if (otherCouponCode != null) {
                 // 由于对下面逻辑 不是很清楚 并且修改了 优惠券传参规则 所以直接设置一遍 防止出错
                 shoppingCartInfoRequestVo.setCouponCode(otherCouponCode.getCouponCode());
                 shoppingCartInfoRequestVo.setActivityCode(otherCouponCode.getActivityCode());
             }
         }
+
         String menuType = shoppingCartInfoRequestVo.getMenuType();
         Integer orderType = shoppingCartInfoRequestVo.getOrderType();
         // 获取购物车商品
@@ -400,15 +404,13 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
             assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, assortmentCustomerInfoVo.getSessionId(), "", this.shoppingCartBaseService);
         }
         ArrayList<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(couponCodes)) {
-            couponCodes.forEach(shoppingCouponCode -> {
+        if (StringUtils.isNotEmpty(couponCode)) {
             CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
-                coupon.setCode(shoppingCouponCode.getCouponCode());
-                coupon.setActivityCode(shoppingCouponCode.getActivityCode());
-                coupon.setCouponType(shoppingCouponCode.getCouponType());
+            coupon.setCode(couponCode);
+            coupon.setActivityCode(activityCode);
             coupons.add(coupon);
-            });
         }
+
         buildCoupons(coupons,shoppingCartInfoRequestVo.getCouponCodes());
 
 

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

@@ -619,14 +619,15 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         String partnerId = shoppingCartInfoRequestVo.getPartnerId();
         String storeId = shoppingCartInfoRequestVo.getShopId();
         String appId = shoppingCartInfoRequestVo.getAppId();
-        //String couponCode = shoppingCartInfoRequestVo.getCouponCode();
-        //String activityCode = shoppingCartInfoRequestVo.getActivityCode();
+        String couponCode = shoppingCartInfoRequestVo.getCouponCode();
+        String activityCode = shoppingCartInfoRequestVo.getActivityCode();
         List<ShoppingCartInfoRequestVo.couponCode> couponCodes = shoppingCartInfoRequestVo.getCouponCodes();
-        if (!CollectionUtils.isEmpty(couponCodes)) {
+        // 兼容老版本
+        if (CollectionUtils.isNotEmpty(couponCodes) && StringUtils.isEmpty(couponCode)) {
             ShoppingCartInfoRequestVo.couponCode otherCouponCode = couponCodes.stream()
-                    .filter(couponCode -> !couponCode.getCouponType().equals(CouponTypeEnum.TYPE_5.getCode()))
+                    .filter(couponCode1 -> couponCode1.getCouponType()!=null && couponCode1.getCouponType().compareTo(CouponTypeEnum.TYPE_5.getCode()) != 0)
                     .findFirst().orElse(null);
-            if (otherCouponCode !=null) {
+            if (otherCouponCode != null) {
                 // 由于对下面逻辑 不是很清楚 并且修改了 优惠券传参规则 所以直接设置一遍 防止出错
                 shoppingCartInfoRequestVo.setCouponCode(otherCouponCode.getCouponCode());
                 shoppingCartInfoRequestVo.setActivityCode(otherCouponCode.getActivityCode());
@@ -680,12 +681,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         CouponPromotionVO couponPromotionVO = couponAdapter.getCouponPromotionVO(shoppingCartInfoRequestVo, userLoginInfoDto);
         if (grayPush(partnerId,storeId,"2")) {
             ArrayList<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
-//            if (StringUtils.isNotEmpty(couponCode)) {
-//                CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
-//                coupon.setCode(couponCode);
-//                coupon.setActivityCode(activityCode);
-//                coupons.add(coupon);
-//            }
+            if (StringUtils.isNotEmpty(couponCode)) {
+                CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
+                coupon.setCode(couponCode);
+                coupon.setActivityCode(activityCode);
+                coupons.add(coupon);
+            }
 
             buildCoupons(coupons,shoppingCartInfoRequestVo.getCouponCodes());
 
@@ -734,20 +735,22 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         else {
             List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
             // 当couponCode不为空时，需参与价格计算
-//            if (StringUtils.isNotEmpty(couponCode)) {
-//                ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
-//                coupon.setCode(couponCode);
-//                coupon.setActivityCode(activityCode);
-//                coupons.add(coupon);
-//            }
+            if (StringUtils.isNotEmpty(couponCode)) {
+                ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
+                coupon.setCode(couponCode);
+                coupon.setActivityCode(activityCode);
+                coupons.add(coupon);
+            }
             // 配送券信息放入 用于促销计算
-            if (!CollectionUtils.isEmpty(shoppingCartInfoRequestVo.getCouponCodes())) {
+            if (CollectionUtils.isNotEmpty(shoppingCartInfoRequestVo.getCouponCodes())) {
                 shoppingCartInfoRequestVo.getCouponCodes().forEach(shoppingCode ->{
                     ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
+                    if (!shoppingCode.getCouponCode().equals(couponCode)) {
                         coupon.setCode(shoppingCode.getCouponCode());
                         coupon.setActivityCode(shoppingCode.getActivityCode());
                         coupon.setCouponType(shoppingCode.getCouponType());
                         coupons.add(coupon);
+                    }
                 });
             }
 
@@ -783,14 +786,14 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             request.setSessionId(shoppingCartInfoRequestVo.getSessionId());
             request.setShopId(shoppingCartInfoRequestVo.getShopId());
             request.setVersion(shoppingCartInfoRequestVo.getVersion());
-            if (!CollectionUtils.isEmpty(shoppingCartInfoRequestVo.getCouponCodes())) {
+            if (CollectionUtils.isNotEmpty(shoppingCartInfoRequestVo.getCouponCodes())) {
                 List<PremiumExchangeRequestVo.couponCode> list = new ArrayList<>();
-                shoppingCartInfoRequestVo.getCouponCodes().forEach(couponCode -> {
+                shoppingCartInfoRequestVo.getCouponCodes().forEach(code -> {
                     PremiumExchangeRequestVo.couponCode vo = new PremiumExchangeRequestVo.couponCode();
-                    vo.setActivityCode(couponCode.getActivityCode());
-                    vo.setCouponCode(couponCode.getCouponCode());
-                    vo.setCouponType(couponCode.getCouponType());
-                    vo.setIndex(couponCode.getIndex());
+                    vo.setActivityCode(code.getActivityCode());
+                    vo.setCouponCode(code.getCouponCode());
+                    vo.setCouponType(code.getCouponType());
+                    vo.setIndex(code.getIndex());
                     list.add(vo);
                 });
                 request.setCouponCodes(list);