Преглед изворни кода

Merge branch 'V1.1.3' of http://git.tjyourong.com.cn/ctop/adsp-boot into V1.1.3

yumeng пре 4 година
родитељ
комит
829579be7d

+ 26 - 8
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouBatchGroupPreviewController.java

@@ -1,7 +1,10 @@
 package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouBatchCreativePreview;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouBatchGroupPreview;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouBatchCreativePreviewService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouBatchGroupPreviewService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -54,6 +57,8 @@ import java.util.Map;
 public class KuaishouBatchGroupPreviewController {
     @Autowired
     private IKuaishouBatchGroupPreviewService kuaishouBatchGroupPreviewService;
+    @Autowired
+    private IKuaishouBatchCreativePreviewService kuaishouBatchCreativePreview;
 
     /**
      * 分页列表查询
@@ -112,16 +117,29 @@ public class KuaishouBatchGroupPreviewController {
     @PostMapping(value = "/edit")
     public Result<KuaishouBatchGroupPreview> edit(@RequestBody KuaishouBatchGroupPreview kuaishouBatchGroupPreview) {
         Result<KuaishouBatchGroupPreview> result = new Result<KuaishouBatchGroupPreview>();
-        KuaishouBatchGroupPreview kuaishouBatchGroupPreviewEntity = kuaishouBatchGroupPreviewService.getById(kuaishouBatchGroupPreview.getId());
-        if (kuaishouBatchGroupPreviewEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = kuaishouBatchGroupPreviewService.updateById(kuaishouBatchGroupPreview);
-            if (ok) {
-                result.success("修改成功!");
+        try {
+            KuaishouBatchGroupPreview kuaishouBatchGroupPreviewEntity = kuaishouBatchGroupPreviewService.getById(kuaishouBatchGroupPreview.getId());
+            if (kuaishouBatchGroupPreviewEntity == null) {
+                result.error500("未找到对应实体");
+            } else {
+                boolean ok = kuaishouBatchGroupPreviewService.updateById(kuaishouBatchGroupPreview);
+                if (!Check.isNull(kuaishouBatchGroupPreview.getClickTrackUrl()) && !Check.isNull(kuaishouBatchGroupPreview.getSiteId()) && !Check.isNull(kuaishouBatchGroupPreview.getActionbarClickUrl())) {
+                    KuaishouBatchCreativePreview creative = new KuaishouBatchCreativePreview();
+                    creative.setClickTrackUrl(kuaishouBatchGroupPreview.getClickTrackUrl());
+                    creative.setSiteId(kuaishouBatchGroupPreview.getSiteId());
+                    creative.setActionbarClickUrl(kuaishouBatchGroupPreview.getActionbarClickUrl());
+                    QueryWrapper<KuaishouBatchCreativePreview> wrapper = new QueryWrapper<>();
+                    wrapper.eq("group_id", kuaishouBatchGroupPreview.getId());
+                    kuaishouBatchCreativePreview.update(creative, wrapper);
+                }
+                if (ok) {
+                    result.success("修改成功!");
+                }
             }
+        } catch (Exception e) {
+            log.error("修改异常", e);
+            result.error500("修改失败");
         }
-
         return result;
     }
 

+ 5 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaishouBatchCampaignPreview.java

@@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
-import javax.persistence.Table;
 import java.util.Date;
 import java.util.List;
 
@@ -47,6 +46,10 @@ public class KuaishouBatchCampaignPreview {
     @ApiModelProperty(value = "计划名称")
     private String campaignName;
     /**
+     * 命名格式
+     */
+    private String campaignNameFormat;
+    /**
      * 2 - 提升应用安装;
      */
     @Excel(name = "2 - 提升应用安装;", width = 15)
@@ -112,6 +115,6 @@ public class KuaishouBatchCampaignPreview {
     private Long campaignId;
 
     @TableField(exist = false)
-    private List<KuaishouBatchGroupPreview>  kuaishouBatchGroupPreviews;
+    private List<KuaishouBatchGroupPreview> kuaishouBatchGroupPreviews;
 
 }

+ 5 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaishouBatchGroupPreview.java

@@ -65,6 +65,10 @@ public class KuaishouBatchGroupPreview {
     @ApiModelProperty(value = "广告组名称")
     private String unitName;
     /**
+     * 命名格式
+     */
+    private String unitNameFormat;
+    /**
      * 投放状态 1:投放中;2:暂停
      */
     @Excel(name = "投放状态 1:投放中;2:暂停", width = 15)
@@ -253,6 +257,6 @@ public class KuaishouBatchGroupPreview {
     private String actionbarClickUrl;
 
     @TableField(exist = false)
-    private String siteId;
+    private Long siteId;
 
 }

+ 3 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouBatchCampaignPreviewServiceImpl.java

@@ -81,7 +81,7 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
                     obj.put("imageUrl", creativePreview.getImageUrl());
                     materialArr.add(obj);
                     descriptionArr.add(creativePreview.getDescription());
-                    groupPreview.setSiteId(creativePreview.getSiteId() + "");
+                    groupPreview.setSiteId(creativePreview.getSiteId());
                     groupPreview.setClickTrackUrl(creativePreview.getClickTrackUrl());
                     groupPreview.setActionbarClickUrl(creativePreview.getActionbarClickUrl());
                 }
@@ -441,6 +441,7 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
         KuaishouBatchCampaignPreview campaignPreview = new KuaishouBatchCampaignPreview();
         campaignPreview.setAccountId(campaignJson.getLong("accountId"));
         campaignPreview.setCampaignName(campaignJson.getString("campaignName"));
+        campaignPreview.setCampaignNameFormat(campaignJson.getString("campaignName"));
         campaignPreview.setCampaignType(campaignJson.getInteger("campaignType"));
         campaignPreview.setPutStatus(campaignJson.getInteger("campaignStatus"));
         campaignPreview.setDayBudget(campaignJson.getInteger("dayBudget"));
@@ -463,6 +464,7 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
         KuaishouBatchGroupPreview groupPreview = new KuaishouBatchGroupPreview();
         groupPreview.setAccountId(groupJson.getLong("accountId"));
         groupPreview.setUnitName(groupJson.getString("unitName"));
+        groupPreview.setUnitNameFormat(groupJson.getString("unitName"));
         groupPreview.setPutStatus(campaignJson.getInteger("unitStatus") == 2 ? 2 : null);
         groupPreview.setBidType(groupJson.getInteger("bidType"));
         if (groupJson.getInteger("bidType") == 2) {