修改

src/main/java/com/lwby/marketing/controller/ClickbackService.java

@@ -203,17 +203,30 @@ public class ClickbackService extends ServiceHelper{
         DeliveryDeviceInfo deliveryDeviceInfo = new DeliveryDeviceInfo();
         deliveryDeviceInfo.setClick_time(System.currentTimeMillis());
         deliveryDeviceInfo.setAd_group_id(params.get("campaign_id"));
-        deliveryDeviceInfo.setAd_creative_id(params.get("cid"));
-        deliveryDeviceInfo.setAd_plan_id(params.get("adid"));
         deliveryDeviceInfo.setMedia(media.name);
-        deliveryDeviceInfo.setPlatform_id(params.get("platform_id"));
         deliveryDeviceInfo.setDj_channel(params.get("channel"));
+        //短剧视频合集和视频id
+        deliveryDeviceInfo.setVideoResourceId(params.get("videoResourceId"));
+        deliveryDeviceInfo.setVideoId(params.get("videoId"));
         deliveryDeviceInfo.setBook_id(StringUtils.defaultIfBlank(params.get("book"), StringUtils.defaultIfBlank(params.get("books"), params.get("book_id"))));
-        deliveryDeviceInfo.setCallback_param(params.get("callback_param"));
-        if (Objects.isNull(deliveryDeviceInfo.getCallback_param())) {
-            deliveryDeviceInfo.setCallback_url(params.get("callback_url"));
+        if (media.name.equals(Media.NOVEL_GDT)) {
+            deliveryDeviceInfo.setClick_id(params.get("click_id"));
+            deliveryDeviceInfo.setAd_creative_id(params.get("ad_id"));
+            deliveryDeviceInfo.setAd_plan_id(params.get("adgroup_id"));
+            deliveryDeviceInfo.setPlatform_id(params.get("platformId"));
+            deliveryDeviceInfo.setCallback_url(params.get("callback"));
+            deliveryDeviceInfo.setAdvertiser_id(params.get("account_id"));
+
+        } else {
+            deliveryDeviceInfo.setAd_creative_id(params.get("cid"));
+            deliveryDeviceInfo.setAd_plan_id(params.get("adid"));
+            deliveryDeviceInfo.setCallback_param(params.get("callback_param"));
+            deliveryDeviceInfo.setPlatform_id(params.get("platform_id"));
+            if (Objects.isNull(deliveryDeviceInfo.getCallback_param())) {
+                deliveryDeviceInfo.setCallback_url(params.get("callback_url"));
+            }
+            deliveryDeviceInfo.setAdvertiser_id(params.get("advertiser_id"));
         }
-        deliveryDeviceInfo.setAdvertiser_id(params.get("advertiser_id"));
         deliveryDeviceInfo.setUuid(UUID.randomUUID().toString());
         deliveryDeviceInfo.setAd_platform_type(params.get("ad_platform_type"));
         deliveryDeviceInfo.setTarget_audience(params.get("target_audience"));