Przeglądaj źródła

Merge branch 'test'

hcst_sunzhen 5 lat temu
rodzic
commit
a3a1a07257

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java

@@ -252,6 +252,7 @@ public class CallbackController {
                 return "授权绑定成功";
             }
             logger.info("返回信息:{}", map.toString());
+            return (String) map.get("desc");
         }
         return "授权绑定失败";
     }
@@ -355,7 +356,6 @@ public class CallbackController {
             e.printStackTrace();
             returnMap.put("code", -1);
             returnMap.put("desc", "回调token异常");
-
         }
         return returnMap;
     }

+ 6 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouCreative.java

@@ -206,4 +206,10 @@ public class KuaiShouCreative {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
+
+    private Integer firstFrameType;
+
+    private Date creativeCreateTime;
+
+    private Date creativeUpdateTime;
 }

+ 6 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouCreativeMapper.xml

@@ -29,7 +29,9 @@
         ad_photo_played_t3s_url,
         description,
         action_bar_text,
-
+        first_frame_type,
+        creative_create_time,
+        creative_update_time,
         create_time,
         update_time)
         values
@@ -61,6 +63,9 @@
             #{creative.adPhotoPlayedT3sUrl},
             #{creative.description},
             #{creative.actionBarText},
+            #{creative.firstFrameType},
+            #{creative.creativeCreateTime},
+            #{creative.creativeUpdateTime},
             #{creative.createTime},
             #{creative.updateTime})
         </foreach>

+ 6 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -1802,6 +1802,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         creative.setDescription(displayInfoJson.getString("description"));
                         creative.setActionBarText(displayInfoJson.getString("action_bar_text"));
                     }
+
                     creative.setCreateTime(new Date());
                     creative.setUpdateTime(new Date());
                     creatives.add(creative);
@@ -1971,6 +1972,11 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         creative.setDescription(displayInfoJson.getString("description"));
                         creative.setActionBarText(displayInfoJson.getString("action_bar_text"));
                     }
+
+                    creative.setFirstFrameType(detailJson.getInteger("first_frame_type"));
+                    creative.setCreativeCreateTime(detailJson.get("create_time")==null?null:detailJson.getDate("create_time"));
+                    creative.setCreativeUpdateTime(detailJson.get("update_time")==null?null:detailJson.getDate("update_time"));
+
                     creative.setCreateTime(new Date());
                     creative.setUpdateTime(new Date());
                     creatives.add(creative);

+ 2 - 1
module-report/src/main/java/cn/com/ctop/bytedance/service/impl/BytedanceCreativeDailyReportServiceImpl.java

@@ -51,7 +51,8 @@ public class BytedanceCreativeDailyReportServiceImpl extends ServiceImpl<Bytedan
         if (Check.isNull(accountIds)) {
             return null;
         }
-        paramsMap.put("accountIds", accountIds);
+        List<String> list = JSONObject.parseArray(accountIds.toJSONString(), String.class);
+        paramsMap.put("accountIds", list);
         String nowDate = json.getString("startDate");
         String endDate = json.getString("endDate");
         paramsMap.put("startDate", nowDate);