fix 推广者优惠码

netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpEventActionServiceImpl.java

@@ -965,7 +965,7 @@ public class CorpEventActionServiceImpl implements CorpEventActionService {
 		//是否是手机用户 或者 邮箱用户
 		Set<Long> relationUserIds = getRelationUserIds(phone);
 		if (CollUtil.isEmpty(relationUserIds)) {
-			log.info("该备注手机号:{]暂无关联银河用户", phone);
+			log.info("该备注手机号:{}暂无关联银河用户", phone);
 			return;
 		}
 		List<RenewalView> list = beanSearcher.searchAll(RenewalView.class, MapUtils.builder()

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

@@ -389,12 +389,15 @@ public class DistributeServiceImpl implements DistributeService {
 			if (StrUtil.isEmpty(exCode)) {
 				throw BusinessRuntimeException.getInstance("优惠码为空");
 			}
-			Integer count = couponDistributePopularizeMapper.selectCount(Wrappers.lambdaQuery(CouponDistributePopularize.class).ne(data.getId() != null, CouponDistributePopularize::getId, data.getId()).eq(CouponDistributePopularize::getDeleted, 1).eq(CouponDistributePopularize::getExCode, exCode));
+			Integer count = couponDistributePopularizeMapper.selectCount(Wrappers.lambdaQuery(CouponDistributePopularize.class).ne(data.getId() != null, CouponDistributePopularize::getId, data.getId())
+					.eq(CouponDistributePopularize::getDeleted, 1)
+					.eq(CouponDistributePopularize::getIsGeneral, false)
+					.eq(CouponDistributePopularize::getExCode, exCode));
 			if (count == 0) {
 				count = couponMapper.selectCount(Wrappers.lambdaQuery(Coupon.class).eq(Coupon::getExCode, exCode).eq(Coupon::getDeleted, true));
 			}
 			if (count > 0) {
-				throw BusinessRuntimeException.getInstance("优惠码:{]已存在", exCode);
+				throw BusinessRuntimeException.getInstance("优惠码:{}已存在", exCode);
 			}
 			if (data.getId() != null) {
 				couponDistributePopularizeMapper.updateById(data);