update

src/main/java/com/gogirl/application/market/coupon/impl/CouponServiceImpl.java

@@ -7,6 +7,7 @@ import com.gogirl.application.market.coupon.CouponService;
 import com.gogirl.application.market.coupon.MarketService;
 import com.gogirl.domain.market.coupon.Coupon;
 import com.gogirl.domain.market.coupon.CouponCustomerRelevance;
+import com.gogirl.domain.market.discount.DiscountConfig;
 import com.gogirl.domain.order.serve.OrderManage;
 import com.gogirl.domain.order.serve.OrderServe;
 import com.gogirl.domain.xcx.GogirlConfig;
@@ -15,6 +16,7 @@ import com.gogirl.infrastructure.common.util.ListUtil;
 import com.gogirl.infrastructure.common.util.StringUtils;
 import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper;
 import com.gogirl.infrastructure.mapper.market.coupon.CouponMapper;
+import com.gogirl.infrastructure.mapper.market.discount.DiscountConfigMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OrderServeMapper;
 import com.gogirl.infrastructure.mapper.xcx.GogirlConfigMapper;
@@ -49,6 +51,9 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
     @Resource
     private MarketService marketService;
 
+    @Resource
+    private DiscountConfigMapper discountConfigMapper;
+
     @Override
     public Coupon checkNewCustomer(Integer customerId) {
         //新用户配置
@@ -106,6 +111,13 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
 
         /*2、发放卡券*/
         CouponCustomerRelevance couponCustomerRelevance = CouponCustomerRelevance.getInstance(coupon);
+
+        //是否免单券
+        DiscountConfig discountConfig = discountConfigMapper.selectOne(new LambdaQueryWrapper<DiscountConfig>()
+                .eq(DiscountConfig::getCouponId, couponId));
+        if (discountConfig != null) {
+            couponCustomerRelevance.setIsFreeVoucher(1);
+        }
         couponCustomerRelevance.setCustomerId(customerId);
         couponCustomerRelevanceMapper.insert(couponCustomerRelevance);
 

src/main/java/com/gogirl/domain/market/coupon/CouponCustomerRelevance.java

@@ -111,6 +111,9 @@ public class CouponCustomerRelevance implements Serializable {
     @ApiModelProperty("1-计算 2-不计算")
     private Integer isCalcAchievement = 1;
 
+    @ApiModelProperty("是否免单券 1-是 2-否")
+    private Integer isFreeVoucher;
+
     /**
      * 根据优惠券配置构造一张优惠券
      * <p>