fix

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

@@ -24,8 +24,6 @@ public class EnvCommonService {
 
 	public static String DISTRIBUTE_DEFAULT_URL_PREFIX;
 
-	public static String DISTRIBUTE_DESIGN_URL_PREFIX;
-
 	@Value(value = "${spring.profiles.active}")
 	private String env;
 
@@ -54,8 +52,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_DEFAULT_URL_PREFIX += "%s";
 	}
 }

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

@@ -4,6 +4,8 @@ import com.cyksj.common.EnvCommonService;
 import com.cyksj.common.annotation.NoSubmit;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.UserMapper;
+import com.cyksj.model.entity.User;
 import com.cyksj.model.entity.UserDistributePopularize;
 import com.cyksj.model.views.UserDistributePopularizeView;
 import com.cyksj.service.cps.CpsPopularizeService;
@@ -37,6 +39,8 @@ public class CpsPopularizeController {
 
 	private final EnvCommonService envCommonService;
 
+	private final UserMapper userMapper;
+
 	/**
 	 * 渠道推广链接列表
 	 */
@@ -47,7 +51,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_DEFAULT_URL_PREFIX, data.getCode()));
 		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}
@@ -58,13 +62,14 @@ public class CpsPopularizeController {
 	@GetMapping("/get/default")
 	public Result<UserDistributePopularizeView> getDefaultDetail() {
 		long cpsUserId = StpCpsManageUser.getLoginIdAsLong();
+		User user = userMapper.selectById(cpsUserId);
 		UserDistributePopularizeView view = Optional.ofNullable(cpsPopularizeService.getDefaultPopularizeDetail(cpsUserId)).orElseGet(()->{
 			UserDistributePopularizeView newPopularizeView = new UserDistributePopularizeView();
 			newPopularizeView.setOrders(0);
 			newPopularizeView.setOrdersMoney(BigDecimal.ZERO);
 			return newPopularizeView;
 		});
-		view.setPopularizeLink(String.format(envCommonService.DISTRIBUTE_DEFAULT_URL_PREFIX, cpsUserId));
+		view.setPopularizeLink(String.format(envCommonService.DISTRIBUTE_DEFAULT_URL_PREFIX, user.getShowId()));
 		return GatewayResponse.SUCCESS.newBuilder().toResult(view);
 	}
 

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

@@ -29,6 +29,7 @@ import com.cyksj.model.request.TransferAccountsReq;
 import com.cyksj.model.views.*;
 import com.cyksj.service.order.OrderDonService;
 import com.cyksj.service.user.UserBenefitsService;
+import com.cyksj.service.user.UserService;
 import com.cyksj.web.util.StpUserUtil;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
@@ -61,6 +62,8 @@ public class DistributePopularizeController {
 
 	private final UserMapper userMapper;
 
+	private final UserService userService;
+
 	private final BeanSearcher beanSearcher;
 
 	private final GoodsDonMapper goodsDonMapper;
@@ -124,12 +127,15 @@ public class DistributePopularizeController {
 	@GetMapping("/get/detail")
 	public Result<DistributePopularizeView> getDetail() {
 		Long userId = StpUserUtil.getLoginIdAsLong();
+		User user = userMapper.selectById(userId);
+		if (StrUtil.isEmpty(user.getShowId())) {
+			user.setShowId(userService.getUserShowId(userId));
+		}
 		DistributePopularizeView distributePopularizeView = new DistributePopularizeView();
-		String dsUrl = String.format(envCommonService.DISTRIBUTE_DEFAULT_URL_PREFIX, userId);
+		String dsUrl = String.format(envCommonService.DISTRIBUTE_DEFAULT_URL_PREFIX, user.getShowId());
 //		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"));
-		User user = userMapper.selectById(userId);
 		distributePopularizeView.setGotPoints(user.getPoints());
 		Integer orders = userDistributeMapper.count(userId);
 		distributePopularizeView.setDistributeOrders(orders);