fix

netflix-service/src/main/java/com/cyksj/service/distribute/impl/DistributeServiceImpl.java

@@ -165,7 +165,14 @@ public class DistributeServiceImpl implements DistributeService {
 		if (!redisService.setNx(RedisService.key.GENERAL_POPULARIZE_CODE.getName() + code, userId, RedisService.key.GENERAL_POPULARIZE_CODE.getTimeout())) {
 			throw BusinessRuntimeException.getInstance("该专属推广优惠码已被设置");
 		}
-		CouponDistributePopularize is_exists = couponDistributePopularizeMapper.selectOne(Wrappers.lambdaQuery(CouponDistributePopularize.class).eq(CouponDistributePopularize::getUserId, userId).last("limit 1"));
+		UserDistribute userDistribute = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class)
+				.eq(UserDistribute::getUserId, userId)
+				.eq(UserDistribute::getDeleted, true)
+				.last("limit 1"));
+		if (userDistribute != null) throw BusinessRuntimeException.getInstance("只适用于普通用户进行专属推广");
+		CouponDistributePopularize is_exists = couponDistributePopularizeMapper.selectOne(Wrappers.lambdaQuery(CouponDistributePopularize.class)
+				.eq(CouponDistributePopularize::getUserId, userId)
+				.last("limit 1"));
 		if (is_exists != null) throw BusinessRuntimeException.getInstance("你已设置专属推广优惠码");
 		CouponDistributePopularize couponDistributePopularize = new CouponDistributePopularize();
 		couponDistributePopularize.setCouponId(coupon.getId());

netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -18,6 +18,7 @@ import com.cyksj.mapper.GoodsDonMapper;
 import com.cyksj.mapper.GoodsDonSkuMapper;
 import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.manage.cms.CmsUserMapper;
+import com.cyksj.mapper.manage.coupon.CouponDistributePopularizeMapper;
 import com.cyksj.mapper.manage.distribute.*;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.request.DistributeApplyMoneyReq;
@@ -90,6 +91,8 @@ public class DistributeController {
 
 	private final UserBenefitsService userBenefitsService;
 
+	private final CouponDistributePopularizeMapper couponDistributePopularizeMapper;
+
 	/**
 	 * 添加固定推广者
 	 */
@@ -102,6 +105,10 @@ public class DistributeController {
 		Long businessId = userDistributeReq.getBusinessId();
 		//保存商务人员提成比例
 		userBusinessRateService.saveBusinessRate(businessId);
+		//清除 之前有普通推广专属码
+		couponDistributePopularizeMapper.delete(Wrappers.lambdaQuery(CouponDistributePopularize.class)
+				.eq(CouponDistributePopularize::getUserId, userDistributeReq.getUserId())
+				.eq(CouponDistributePopularize::getIsGeneral, true));
 		return GatewayResponse.SUCCESS.newBuilder().toResult("添加成功");
 	}