打开纪录券功能

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

@@ -22,10 +22,7 @@ import cn.freemud.service.impl.AssortmentSdkService;
 import cn.freemud.service.impl.FullSubtractionActivityServiceImpl;
 import cn.freemud.service.impl.mcoffee.calculation.CalculationServiceImpl;
 import cn.freemud.service.impl.mcoffee.calculation.CouponDiscountCalculation;
-import cn.freemud.service.impl.mcoffee.entity.CopyShoppingCartRequestVo;
-import cn.freemud.service.impl.mcoffee.entity.CouponAvailableReq;
-import cn.freemud.service.impl.mcoffee.entity.MCoffeeAddGoodsRequestVo;
-import cn.freemud.service.impl.mcoffee.entity.SwitchShoppingCartRequestVo;
+import cn.freemud.service.impl.mcoffee.entity.*;
 import cn.freemud.service.thirdparty.CustomerApplicationClient;
 import cn.freemud.service.thirdparty.ProductClient;
 import cn.freemud.utils.ResponseUtil;
@@ -334,24 +331,24 @@ public class ShoppingCartMCoffeeServiceImpl {
          * 如果couponCode为空，则从缓存里尝试获取
          * 如果couponCode不为空，则设置到缓存里
          */
-//        if(StringUtils.isEmpty(couponCode)) {
-//            couponCode = assortmentSdkService.getShoppingCartCoupon(partnerId, storeId, userId, shoppingCartBaseService);
-//            if(StringUtils.isNotEmpty(couponCode)) {
-//                List<CouponState> couponStates = couponDiscountCalculation.buildAvailableCoupons(cartGoodsList, partnerId, storeId, Lists.newArrayList(couponCode));
-//                if(CollectionUtils.isNotEmpty(couponStates)) {
-//                    if(Objects.equals(couponStates.get(0).getState(), CouponStateEnum.STATE_1.getCode())) {
-//                        couponCode = "";
-//                    }
-//                } else {
-//                    couponCode = "";
-//                }
-//            }
-//        } else {
-//            if("remove".equals(couponCode)) {
-//                couponCode = "";
-//            }
-//            assortmentSdkService.setShoppingCartCouponCode(partnerId, storeId, userId, couponCode, shoppingCartBaseService);
-//        }
+        if(StringUtils.isEmpty(couponCode)) {
+            couponCode = assortmentSdkService.getShoppingCartCoupon(partnerId, storeId, userId, shoppingCartBaseService);
+            if(StringUtils.isNotEmpty(couponCode)) {
+                List<CouponState> couponStates = couponDiscountCalculation.buildAvailableCoupons(cartGoodsList, partnerId, storeId, Lists.newArrayList(couponCode));
+                if(CollectionUtils.isNotEmpty(couponStates)) {
+                    if(Objects.equals(couponStates.get(0).getState(), CouponStateEnum.STATE_1.getCode())) {
+                        couponCode = "";
+                    }
+                } else {
+                    couponCode = "";
+                }
+            }
+        } else {
+            if("remove".equals(couponCode)) {
+                couponCode = "";
+            }
+            assortmentSdkService.setShoppingCartCouponCode(partnerId, storeId, userId, couponCode, shoppingCartBaseService);
+        }
 
         // 当couponCode不为空时，需参与价格计算
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList);