|
@@ -1085,6 +1085,12 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
List<KuaishouChannel> channelList = channelMapper.queryByAccountIdLevel(accountId, "account");
|
|
List<KuaishouChannel> channelList = channelMapper.queryByAccountIdLevel(accountId, "account");
|
|
if (!Check.isNull(channelList)) {
|
|
if (!Check.isNull(channelList)) {
|
|
for (KuaishouChannel channel : channelList) {
|
|
for (KuaishouChannel channel : channelList) {
|
|
|
|
+ if(channel.getIsHaveItem() == 1){
|
|
|
|
+ List<KuaishouChannelItems> list = channelItemsRelService.queryItems(channel.getId());
|
|
|
|
+ if (Check.isNull(list) || list.isEmpty()) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
KuaishouChannelRel channelRel = channelRelService.queryByAccountChannelCode(channel.getChannelCode(), accountId, appName);
|
|
KuaishouChannelRel channelRel = channelRelService.queryByAccountChannelCode(channel.getChannelCode(), accountId, appName);
|
|
if (Check.isNull(channelRel)) {
|
|
if (Check.isNull(channelRel)) {
|
|
continue;
|
|
continue;
|
|
@@ -1125,6 +1131,12 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
Integer usageTimes = channel.getUsageTimes();//使用次数
|
|
Integer usageTimes = channel.getUsageTimes();//使用次数
|
|
//优先判断已经循环的次数 大于 使用次数
|
|
//优先判断已经循环的次数 大于 使用次数
|
|
if (haveCycleTimes > usageTimes) {
|
|
if (haveCycleTimes > usageTimes) {
|
|
|
|
+ if(channel.getIsHaveItem() == 1){
|
|
|
|
+ List<KuaishouChannelItems> items = channelItemsRelService.queryItems(channel.getId());
|
|
|
|
+ if (Check.isNull(items) || items.isEmpty()) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
// 符合条件,获取该渠道号
|
|
// 符合条件,获取该渠道号
|
|
KuaishouChannelRel channelRel = channelRelService.queryByAccountChannelCode(channel.getChannelCode(), accountId, appName);
|
|
KuaishouChannelRel channelRel = channelRelService.queryByAccountChannelCode(channel.getChannelCode(), accountId, appName);
|
|
if (Check.isNull(channelRel)) {
|
|
if (Check.isNull(channelRel)) {
|