|
@@ -14,6 +14,7 @@ import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaiShouAppInfoService;
|
|
import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouAppPackageService;
|
|
import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouAppPackageService;
|
|
import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppList;
|
|
import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppList;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppListService;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppListService;
|
|
|
|
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreativeService;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouMaterialUploadService;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouMaterialUploadService;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
|
|
import cn.com.ctop.kuaishou.modules.channel.entity.KuaishouChannel;
|
|
import cn.com.ctop.kuaishou.modules.channel.entity.KuaishouChannel;
|
|
@@ -92,6 +93,9 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
private IKuaishouChannelAppInfoService channelAppInfoService;
|
|
private IKuaishouChannelAppInfoService channelAppInfoService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ private IKuaiShouCreativeService kuaiShouCreativeService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
private IKuaiShouAppListService kuaiShouAppListService;
|
|
private IKuaiShouAppListService kuaiShouAppListService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -145,7 +149,12 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
public Result<Object> channelNumberUsageDetailsList(KuaishouChannel kuaishouChannel, Integer pageNo, Integer pageSize) {
|
|
public Result<Object> channelNumberUsageDetailsList(KuaishouChannel kuaishouChannel, Integer pageNo, Integer pageSize) {
|
|
Long total = channelMapper.channelNumberUsageDetailsListTotal(kuaishouChannel);
|
|
Long total = channelMapper.channelNumberUsageDetailsListTotal(kuaishouChannel);
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
- PageInfo pageInfo = new PageInfo(channelMapper.channelNumberUsageDetailsList(kuaishouChannel));
|
|
|
|
|
|
+ List<JSONObject> list = channelMapper.channelNumberUsageDetailsList(kuaishouChannel);
|
|
|
|
+ for (JSONObject jsonObject : list) {
|
|
|
|
+ String time = kuaiShouCreativeService.querMaxCreateTime(jsonObject.getLong("unitId"));
|
|
|
|
+ jsonObject.put("createTime",time);
|
|
|
|
+ }
|
|
|
|
+ PageInfo pageInfo = new PageInfo(list);
|
|
pageInfo.setTotal(total);
|
|
pageInfo.setTotal(total);
|
|
return Result.ok(pageInfo);
|
|
return Result.ok(pageInfo);
|
|
}
|
|
}
|