种子券号免校验

order-application-service/src/main/java/cn/freemud/service/impl/CheckMCCafeOrder.java

@@ -55,6 +55,7 @@ import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
 import com.freemud.application.sdk.api.membercenter.service.MemberPropertyService;
 import com.freemud.application.sdk.api.ordercenter.constant.ResponseConstant;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
+import com.freemud.application.sdk.api.ordercenter.enums.ProductTypeEnum;
 import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;
@@ -66,6 +67,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.awt.geom.Point2D;
@@ -116,6 +118,9 @@ public class CheckMCCafeOrder {
     @Autowired
     private DeliveryServiceFeiginMCCafeClient deliveryServiceFeiginMCCafeClient;
 
+    @Value("${mccafe.universal.coupon.code}")
+    private String withOrderBuyCouponCode;
+
     private static Gson gson = new Gson();
     /**
      * 下单会员相关校验
@@ -486,7 +491,7 @@ public class CheckMCCafeOrder {
         if("remove".equals(createOrderVo.getCouponCode())) {
             createOrderVo.setCouponCode("");
         }
-        if("recardNomove".equals(createOrderVo.getFreightCouponCode())) {
+        if("remove".equals(createOrderVo.getFreightCouponCode())) {
             createOrderVo.setFreightCouponCode("");
         }
         if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) {
@@ -558,8 +563,12 @@ public class CheckMCCafeOrder {
         }
         List<MCCafeCouponVo> mcCafeCouponVos = new ArrayList<>();
         Map<String, String> mcCafeUsedCoupon = new HashMap<>();
+        List<String> seedCardList = shoppingCartGoodsDto.getProducts().stream().filter(o -> ProductTypeEnum.getVirtualProductType().contains(o.getProductType()))
+                .map(o -> o.getMonthCardInfo().getCardCode()).collect(Collectors.toList());
+        seedCardList.add(withOrderBuyCouponCode);
         if(CollectionUtils.isNotEmpty(shoppingCartGoodsDto.getActivityDiscountsDtos())) {
             shoppingCartGoodsDto.getActivityDiscountsDtos().forEach(o-> {
+                if(!seedCardList.contains(o.getActivityCode())) {
                     if(ActivityTypeEnum.TYPE_3.getCode().equals(o.getActivityType()) || ActivityTypeEnum.TYPE_32.getCode().equals(o.getActivityType())
                             || ActivityTypeEnum.TYPE_34.getCode().equals(o.getActivityType()) || ActivityTypeEnum.TYPE_35.getCode().equals(o.getActivityType())) {
                         mcCafeCouponVos.add(new MCCafeCouponVo(o.getActivityCode()));
@@ -572,6 +581,7 @@ public class CheckMCCafeOrder {
                             mcCafeUsedCoupon.put(o.getActivityCode(), o.getActivityName());
                         }
                     }
+                }
             });
         }
         if(CollectionUtils.isNotEmpty(mcCafeCouponVos)) {