|
@@ -126,7 +126,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
|
List<KuaishouChannel> kuaishouChannels = channelMapper.channelNumberDetails(kuaishouChannel);
|
|
|
for (KuaishouChannel channel : kuaishouChannels) {
|
|
|
- List<KuaishouChannelItems> list = channelItemsService.queryItemsByChannelCode(channel.getProjectId(), channel.getChannelCode());
|
|
|
+ List<KuaishouChannelItems> list = channelItemsRelService.queryItems(channel.getId());
|
|
|
channel.setItems(list);
|
|
|
}
|
|
|
PageInfo pageInfo = new PageInfo(kuaishouChannels);
|
|
@@ -858,10 +858,10 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
|
|
|
|
} else {
|
|
|
/**============================项目范围============================*/
|
|
|
- if ("account".equals(usageLevel)) {
|
|
|
- //---------------------账户层级---------------------
|
|
|
- return doProjectRangeAccountLevel(accountId, strategys);
|
|
|
- } else if ("plan".equals(usageLevel) && usageLevel.equals(level)) {
|
|
|
+ if ("account".equals(usageLevel)) {
|
|
|
+ //---------------------账户层级---------------------
|
|
|
+ return doProjectRangeAccountLevel(accountId, strategys);
|
|
|
+ } else if ("plan".equals(usageLevel) && usageLevel.equals(level)) {
|
|
|
//---------------------计划层级---------------------
|
|
|
return doProjectRangePlanLevel(accountId, strategys);
|
|
|
} else if ("group".equals(usageLevel)) {
|
|
@@ -874,6 +874,54 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
|
|
|
|
//通过账户范围计划层级查询
|
|
|
private Result<Object> doAccountRangePlanLevel(Long accountId, List<KuaishouChannelCreateStrategy> strategys) {
|
|
|
+ for (KuaishouChannelCreateStrategy strategy : strategys) {
|
|
|
+ boolean flag = false;
|
|
|
+ Integer cycleTimes = strategy.getCycleTimes();//可循环次数
|
|
|
+ if (strategy.getCreateType() == 1) {
|
|
|
+ /**---------------------组、计划 批量 创建逻辑--------------------------*/
|
|
|
+ Integer numberMin = strategy.getNumberMin();
|
|
|
+ Integer numberMax = strategy.getNumberMax(); //编号最大值
|
|
|
+ //查询所有该策略下创建的渠道号
|
|
|
+ List<KuaishouChannel> builtChannel = channelMapper.queryMaxChannelNumber(strategy.getId());
|
|
|
+ if (!Check.isNull(builtChannel)) {
|
|
|
+ for (KuaishouChannel maxChannel : builtChannel) {
|
|
|
+ Integer haveCycleTimes = maxChannel.getHaveCycleTimes();//已用次数
|
|
|
+ Long channelNumber = maxChannel.getChannelNumber();//已建最大编码
|
|
|
+ //判断可循环次数>已循环次数
|
|
|
+ if (cycleTimes >= haveCycleTimes) {
|
|
|
+ //判断已建的编码,是否最大值,是,就跳过
|
|
|
+ if (channelNumber >= numberMax) {
|
|
|
+ continue;
|
|
|
+ } else {
|
|
|
+ //本次可用编码
|
|
|
+ int number = channelNumber.intValue() + 1;
|
|
|
+ //查询到计划或者组级未被分配给账户的渠道号
|
|
|
+ //获取token
|
|
|
+ CtopOauthToken token = tokenService.getTokenByAccountId(accountId);
|
|
|
+ //获取应用图片token
|
|
|
+ JSONObject tokenJson = getAccountImgToken(strategy.getAppIconUrl(), token);
|
|
|
+ strategy.setImageToken(tokenJson.getString("imageToken"));
|
|
|
+ //使用范围是账户时,查询旧app来做匹配
|
|
|
+ List<KuaiShouAppList> oldAppList = kuaiShouAppListService.getAppListByAccountId(accountId);
|
|
|
+ strategy.setAccountId(accountId);
|
|
|
+ KuaishouChannelCreateStrategy replaceData = replaceWildcard(strategy, number);
|
|
|
+// createApp(strategy, token, oldAppList);
|
|
|
+// createChannel(strategy, number, 1);
|
|
|
+ flag = true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (flag) {
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
return Result.ok();
|
|
|
}
|
|
|
|
|
@@ -889,7 +937,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
|
if (!Check.isNull(channelList)) {
|
|
|
KuaishouChannel channel = channelList.get(0);
|
|
|
KuaishouChannelRel channelRel = channelRelService.queryByAccountChannelCode(channel.getChannelCode(), channel.getAccountId());
|
|
|
- if (Check.isNull(channelRel)) {
|
|
|
+ if (Check.isNull(channelRel)) {/////
|
|
|
return Result.error("未查询到渠道号");
|
|
|
}
|
|
|
if (Check.isNull(channelRel.getAppId())) {
|