校验保存的券是否可用

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

@@ -363,26 +363,24 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 当couponCode不为空时，需参与价格计算
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList);
 
-        //如果用户购物车中已有券，则将券放进购物车中
-        String moneyCoupon = assortmentSdkService.getShoppingCartCoupon(partnerId,
-                storeId, userId, shoppingCartBaseService,SaveCouponType.COUPON.getCode());
-        String deliveryFeeCoupon = assortmentSdkService.getShoppingCartCoupon(partnerId,storeId,
-                userId,shoppingCartBaseService,SaveCouponType.FREIGHT_COUPON.getCode());
-        if (StringUtils.isNotEmpty(deliveryFeeCoupon)){
-            shoppingCartGoodsResponseVo.setFreightCouponCode(deliveryFeeCoupon);
-        }
-        if (StringUtils.isNotEmpty(moneyCoupon)){
-            shoppingCartGoodsResponseVo.setCouponCode(moneyCoupon);
-        }
-
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
                 cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo);
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
 
-        shoppingCartGoodsResponseVo.setCouponCode(couponCode);
-        shoppingCartGoodsResponseVo.setFreightCouponCode(freightCouponCode);
+        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);
     }