浏览代码

修改代码逻辑

syh 4 年之前
父节点
当前提交
2662359531

+ 1 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/controller/ByteDanceBatchController.java

@@ -75,9 +75,8 @@ public class ByteDanceBatchController {
             if (Check.isNull(accountId)) {
             if (Check.isNull(accountId)) {
                 throw new Exception("账户id不能为空");
                 throw new Exception("账户id不能为空");
             }
             }
-
             QueryWrapper<ByteDanceVideoInfo> queryWrapper = new QueryWrapper<>();
             QueryWrapper<ByteDanceVideoInfo> queryWrapper = new QueryWrapper<>();
-            if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
+            if (null!=startDate&&!"".equals(startDate.trim()) && null!=endDate&&!"".equals(endDate.trim())) {
                 queryWrapper.between("create_time", startDate+" 00:00:00", endDate+" 23:59:59");
                 queryWrapper.between("create_time", startDate+" 00:00:00", endDate+" 23:59:59");
             }
             }
             if(null!=type&&type!=0){
             if(null!=type&&type!=0){

+ 1 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/controller/ByteDanceCreativeController.java

@@ -71,6 +71,7 @@ public class ByteDanceCreativeController {
         if(null!=status&&!status.trim().equals("")){
         if(null!=status&&!status.trim().equals("")){
             queryWrapper.eq("opt_status","CREATIVE_STATUS_"+status);
             queryWrapper.eq("opt_status","CREATIVE_STATUS_"+status);
         }
         }
+        queryWrapper.orderByDesc("creative_create_time");
         Page<ByteDanceCreative> page = new Page<>(pageNo, pageSize);
         Page<ByteDanceCreative> page = new Page<>(pageNo, pageSize);
         IPage<ByteDanceCreative> pageList = byteDanceCreativeService.page(page, queryWrapper);
         IPage<ByteDanceCreative> pageList = byteDanceCreativeService.page(page, queryWrapper);
         List<ByteDanceCreative> records = pageList.getRecords();
         List<ByteDanceCreative> records = pageList.getRecords();

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceCreativeServiceImpl.java

@@ -173,7 +173,6 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
         data.put("ad_id", adId);
         data.put("ad_id", adId);
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_creative_create_v2");
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_creative_create_v2");
         JSONObject result = HttpUtils.bytedancePostRequest(token.getAccessToken(),url,data);
         JSONObject result = HttpUtils.bytedancePostRequest(token.getAccessToken(),url,data);
-        System.out.println(result);
         Integer code = result.getInteger("code");
         Integer code = result.getInteger("code");
         String message = result.getString("message");
         String message = result.getString("message");
         if (null == code || code != 0) {
         if (null == code || code != 0) {
@@ -294,6 +293,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             Map<String,Object> getData = creativeCreate(accountId+"",planIds.getLong(i),params);
             Map<String,Object> getData = creativeCreate(accountId+"",planIds.getLong(i),params);
             array.add(getData);
             array.add(getData);
         }
         }
+        getAdvertiserCreative(token,null,null);
         result.put("data",array);
         result.put("data",array);
         ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
         ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
         return result;
         return result;