fix 用户推广链接形式更换

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonBackView.java

@@ -127,6 +127,9 @@ public class OrderDonBackView {
 	@DbField("o.source")
 	private OrderDon.Source source;
 
+	@DbField("o.label_source")
+	private String labelSource;
+
 	@DbField("o.num")
 	private Integer num;
 

netflix-service/src/main/java/com/cyksj/common/EnvCommonService.java

@@ -26,6 +26,8 @@ public class EnvCommonService {
 
 	public static String DISTRIBUTE_DESIGN_URL_PREFIX;
 
+	public static String DISTRIBUTE_NEW_URL_PREFIX;
+
 	@Value(value = "${spring.profiles.active}")
 	private String env;
 
@@ -54,8 +56,6 @@ public class EnvCommonService {
 		if (!DISTRIBUTE_DEFAULT_URL_PREFIX.endsWith("/")) {
 			DISTRIBUTE_DEFAULT_URL_PREFIX += "/";
 		}
-		DISTRIBUTE_DEFAULT_URL_PREFIX += "yinhe/web?sharedId=%s";
-
-		DISTRIBUTE_DESIGN_URL_PREFIX = DISTRIBUTE_DEFAULT_URL_PREFIX.replace("sharedId", "dsCode");
+		DISTRIBUTE_NEW_URL_PREFIX = DISTRIBUTE_DEFAULT_URL_PREFIX + "%s";
 	}
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.constant.TaskTypeEnum;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.mapper.GoodsDonMapper;
+import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.manage.distribute.*;
 import com.cyksj.mapper.market.task.TaskTypeMapper;
 import com.cyksj.model.entity.*;
@@ -43,6 +44,8 @@ public class DistributeServiceImpl implements DistributeService {
 
 	private final UserBusinessDefaultRateConfigMapper defaultRateConfigMapper;
 
+	private final UserMapper userMapper;
+
 	@Override
 	@Transactional(rollbackFor = Throwable.class)
 	public void insertDistribute(UserDistributeReq userDistributeReq) {
@@ -126,6 +129,8 @@ public class DistributeServiceImpl implements DistributeService {
 
 	@Override
 	public void saveDistributionInvitation(Long sharedId, Long userId, Long dsPopularizeId) {
+		User user = userMapper.selectById(sharedId);
+		if (user == null) return;
 		UserDistributeShared userDistributeShared = new UserDistributeShared();
 		userDistributeShared.setSharedId(sharedId);
 		//存在分销

netflix-service/src/main/java/com/cyksj/service/gzh/factory/EventMsgService.java

@@ -1,6 +1,7 @@
 package com.cyksj.service.gzh.factory;
 
 import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -160,6 +161,15 @@ public class EventMsgService implements GzhMsgService {
 					UserDistributePopularize distributePopularize = distributePopularizeMapper.selectOne(Wrappers.lambdaQuery(UserDistributePopularize.class)
 							.eq(UserDistributePopularize::getCode, dsCode)
 							.select(UserDistributePopularize::getUserId, UserDistributePopularize::getId).last("limit 1"));
+					if (distributePopularize == null) {
+						if (NumberUtil.isNumber(dsCode)) {
+							try {
+								sharedId = Long.parseLong(dsCode);
+							} catch (NumberFormatException e) {
+								log.error("类型转化异常");
+							}
+						}
+					}
 					if (distributePopularize != null) {
 						log.info("渠道sharedId:{}设置固定推广链接PC扫码用户分销", distributePopularize.getUserId());
 						sharedId = distributePopularize.getUserId();

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

@@ -1,6 +1,7 @@
 package com.cyksj.service.user.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -103,6 +104,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 			UserDistributePopularize distributePopularize = distributePopularizeMapper.selectOne(Wrappers.lambdaQuery(UserDistributePopularize.class)
 					.eq(UserDistributePopularize::getCode, dsCode)
 					.select(UserDistributePopularize::getUserId, UserDistributePopularize::getId).last("limit 1"));
+			if (distributePopularize == null) {
+				if (NumberUtil.isNumber(dsCode)) {
+					try {
+						sharedId = Long.parseLong(dsCode);
+					} catch (NumberFormatException e) {
+						log.error("类型转化异常");
+					}
+				}
+			}
 			if (distributePopularize != null) {
 				log.info("渠道sharedId:{}设置固定推广链接用户分销", distributePopularize.getUserId());
 				sharedId = distributePopularize.getUserId();

netflix-web/src/main/java/com/cyksj/web/controller/cps/CpsPopularizeController.java

@@ -47,7 +47,7 @@ public class CpsPopularizeController {
 		builder.put("userId", String.format("and user_id = %s", cpsUserId));
 		SearchResult<UserDistributePopularizeView> search = beanSearcher.search(UserDistributePopularizeView.class, builder.build());
 		search.getDataList().forEach(data -> {
-			data.setPopularizeLink(String.format(envCommonService.DISTRIBUTE_DESIGN_URL_PREFIX, data.getCode()));
+			data.setPopularizeLink(String.format(envCommonService.DISTRIBUTE_NEW_URL_PREFIX, data.getCode()));
 		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}
@@ -64,7 +64,7 @@ public class CpsPopularizeController {
 			newPopularizeView.setOrdersMoney(BigDecimal.ZERO);
 			return newPopularizeView;
 		});
-		view.setPopularizeLink(String.format(envCommonService.DISTRIBUTE_DEFAULT_URL_PREFIX, cpsUserId));
+		view.setPopularizeLink(String.format(envCommonService.DISTRIBUTE_NEW_URL_PREFIX, cpsUserId));
 		return GatewayResponse.SUCCESS.newBuilder().toResult(view);
 	}
 

netflix-web/src/main/java/com/cyksj/web/controller/user/AuthorizationController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.codec.Base64;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -409,6 +410,15 @@ public class AuthorizationController {
             UserDistributePopularize distributePopularize = distributePopularizeMapper.selectOne(Wrappers.lambdaQuery(UserDistributePopularize.class)
                     .eq(UserDistributePopularize::getCode, dsCode)
                     .select(UserDistributePopularize::getUserId, UserDistributePopularize::getId).last("limit 1"));
+            if (distributePopularize == null) {
+                if (NumberUtil.isNumber(dsCode)) {
+                    try {
+                        sharedId = Long.parseLong(dsCode);
+                    } catch (NumberFormatException e) {
+                        log.error("类型转化异常");
+                    }
+                }
+            }
             if (distributePopularize != null) {
                 log.info("渠道sharedId:{}设置固定推广链接PC用户分销", distributePopularize.getUserId());
                 sharedId = distributePopularize.getUserId();

netflix-web/src/main/java/com/cyksj/web/controller/user/DistributePopularizeController.java

@@ -125,7 +125,7 @@ public class DistributePopularizeController {
 	public Result<DistributePopularizeView> getDetail() {
 		Long userId = StpUserUtil.getLoginIdAsLong();
 		DistributePopularizeView distributePopularizeView = new DistributePopularizeView();
-		String dsUrl = String.format(envCommonService.DISTRIBUTE_DEFAULT_URL_PREFIX, userId);
+		String dsUrl = String.format(envCommonService.DISTRIBUTE_NEW_URL_PREFIX, userId);
 //		distributePopularizeView.setUrl(String.format("https://%s/8081/api/auth/weChat?url=https://%s/yinhe/web&sharedId=%s", domain, domain, userId));
 		distributePopularizeView.setUrl(dsUrl);
 		distributePopularizeView.setUrlCode(QrCodeUtil.generateAsBase64(distributePopularizeView.getUrl(), QrConfig.create(), "png"));