fix 添加百度渠道发放新人优惠券系统配置

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -59,9 +59,9 @@ public interface Constant {
 	String EQUIPMENT_DISTRIBUTE_KEY = "equipment_distribute_key";
 
 	/**
-	 * 添加规定客服发放优惠券
+	 * 百度渠道 优惠券id
 	 */
-	List<Long> FIXED_CUSTOMER_COUPON_IDS = List.of(38l, 63l);
+	String BAIDU_POPULARIZE_COUPON_IDS = "baidu_popularize_coupon_ids";
 
 	/**
 	 * 系统主账号商户配置key

netflix-service/src/main/java/com/cyksj/service/mange/coupon/impl/CouponCommonServiceImpl.java

@@ -174,7 +174,7 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 			couponUser.setStatus(CouponUser.Status.unused);
 			couponUser.setCouponActiveId(couponActiveId);
 			couponUser.setRecommendId(recommendId);
-			couponUser.setPopularizeId(recommendId);
+			couponUser.setPopularizeId(popularizeId);
 			//优惠券有效时间
 			couponFontService.updateCouponUserValidTime(couponId, couponUser);
 			try {

netflix-service/src/main/java/com/cyksj/service/template/impl/TemplateCommonServiceImpl.java

@@ -101,7 +101,7 @@ public class TemplateCommonServiceImpl implements TemplateCommonService {
 				.field(WxAppTemplateView::getRemark, templateMark);
 		if (userGzhRelation == null) {
 			builder.field(WxAppTemplateView::getAppId, weChatConfig.getAppid());
-		}else {
+		} else {
 			builder.field(WxAppTemplateView::getWxAppId, userGzhRelation.getWxAppId());
 		}
 		String type;

netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cyksj.common.constant.Constant;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
+import com.cyksj.common.util.Jsons;
 import com.cyksj.config.WeChatConfig;
 import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.UserTransferLogMapper;
@@ -20,6 +21,7 @@ import com.cyksj.redis.RedisService;
 import com.cyksj.service.distribute.DistributeService;
 import com.cyksj.service.distribute.equipment.EquipmentDistributeService;
 import com.cyksj.service.mange.coupon.CouponCommonService;
+import com.cyksj.service.sys.SysConfigService;
 import com.cyksj.service.user.UserService;
 import com.ejlchina.searcher.BeanSearcher;
 import lombok.RequiredArgsConstructor;
@@ -27,6 +29,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -55,6 +58,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
 	private final RedisService redisService;
 
+	private final SysConfigService sysConfigService;
+
 	private static final GlobalThreadPoolTaskExecutor TASK_POOL = GlobalThreadPoolTaskExecutor.getInstance();
 
 	@Override
@@ -194,7 +199,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 //				});
 //
 //			}
-			Constant.FIXED_CUSTOMER_COUPON_IDS.forEach(couponId -> couponCommonService.sendCouponToUser(userId, couponId, 0l, 0l, 0l, CouponUser.Channel.wxCorp));
+			SysConfig config = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class)
+					.eq(SysConfig::getSysKey, Constant.BAIDU_POPULARIZE_COUPON_IDS).last("limit 1"));
+			if (config != null) {
+				String sysValue = config.getSysValue();
+				if (StrUtil.isNotBlank(sysValue)) {
+					try {
+						List<Long> couponIds = Jsons.parseList(sysValue, Long.class);
+						couponIds.forEach(couponId -> couponCommonService.sendCouponToUser(userId, couponId, 0l, 0l, popularizeId, CouponUser.Channel.manual));
+					} catch (Exception e) {
+						log.error("百度渠道优惠券解析错误");
+					}
+				}
+			}
 		}
 	}
 }