Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop

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

@@ -351,12 +351,8 @@ public class ShoppingCartMCoffeeServiceImpl {
          * 如果couponCode为空，则从缓存里尝试获取
          * 如果couponCode不为空，则设置到缓存里
          */
-        List<String> couponList = new ArrayList<>();
         if(StringUtils.isEmpty(couponCode)) {
             couponCode = assortmentSdkService.getShoppingCartCoupon(partnerId, storeId, userId, shoppingCartBaseService, SaveCouponType.COUPON.getCode());
-            if(StringUtils.isNotEmpty(couponCode)) {
-                couponList.add(couponCode);
-            }
         } else {
             if("remove".equals(couponCode)) {
                 couponCode = "";
@@ -366,9 +362,6 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         if(StringUtils.isEmpty(freightCouponCode)) {
             freightCouponCode = assortmentSdkService.getShoppingCartCoupon(partnerId, storeId, userId, shoppingCartBaseService, SaveCouponType.FREIGHT_COUPON.getCode());
-            if(StringUtils.isNotEmpty(freightCouponCode)) {
-                couponList.add(freightCouponCode);
-            }
         } else {
             if("remove".equals(freightCouponCode)) {
                 freightCouponCode = "";
@@ -376,24 +369,15 @@ public class ShoppingCartMCoffeeServiceImpl {
             assortmentSdkService.setShoppingCartCouponCode(partnerId, storeId, userId, freightCouponCode, shoppingCartBaseService, SaveCouponType.FREIGHT_COUPON.getCode());
         }
 
-        //校验代金券和运费券是否可用
-        if(CollectionUtils.isNotEmpty(couponList)) {
-            List<CouponState> couponStates = couponDiscountCalculation.buildAvailableCoupons(cartGoodsList, partnerId, storeId, couponList);
-            if(CollectionUtils.isNotEmpty(couponStates)) {
-                Map<String, Integer> couponStateMap = couponStates.stream().collect(Collectors.toMap(CouponState::getCouponCode, CouponState::getState, (k1, k2) -> k1));
-                if(null == couponStateMap.get(couponCode) || Objects.equals(couponStateMap.get(couponCode), CouponStateEnum.STATE_1.getCode())) {
-                    couponCode = "";
-                }
-                if(null == couponStateMap.get(freightCouponCode) || Objects.equals(couponStateMap.get(freightCouponCode), CouponStateEnum.STATE_1.getCode())) {
-                    freightCouponCode = "";
-                }
-            } else {
-                couponCode = "";
-                freightCouponCode = "";
-            }
+        //放到参数里
+        if(StringUtils.isNotEmpty(couponCode) ) {
+            shoppingCartInfoRequestVo.setCouponCode(couponCode);
+            shoppingCartGoodsResponseVo.setCouponCode(couponCode);
+        }
+        if(StringUtils.isNotEmpty(freightCouponCode)) {
+            shoppingCartInfoRequestVo.setFreightCouponCode(freightCouponCode);
+            shoppingCartGoodsResponseVo.setFreightCouponCode(freightCouponCode);
         }
-
-        shoppingCartInfoRequestVo.setFreightCouponCode(freightCouponCode);
 
         String code = "";
         Long payCardPrice =null;
@@ -415,8 +399,21 @@ public class ShoppingCartMCoffeeServiceImpl {
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
 
-        shoppingCartGoodsResponseVo.setCouponCode(couponCode);
-        shoppingCartGoodsResponseVo.setFreightCouponCode(freightCouponCode);
+        //先出参里的券设置为空，然后如果可用，再放到出参里
+        shoppingCartGoodsResponseVo.setCouponCode("");
+        shoppingCartGoodsResponseVo.setFreightCouponCode("");
+        if(StringUtils.isNotEmpty(couponCode) || StringUtils.isNotEmpty(freightCouponCode)) {
+            String finalCouponCode = couponCode;
+            String finalFreightCouponCode = freightCouponCode;
+            shoppingCartGoodsResponseVo.getAvailableCoupon().getUsableCoupons().stream().forEach(o -> {
+                if(o.getCouponCode().equals(finalCouponCode)) {
+                    shoppingCartGoodsResponseVo.setCouponCode(finalCouponCode);
+                }
+                if(o.getCouponCode().equals(finalFreightCouponCode)) {
+                    shoppingCartGoodsResponseVo.setFreightCouponCode(finalFreightCouponCode);
+                }
+            });
+        }
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }