瀏覽代碼

Merge remote-tracking branch 'origin/master'

zhaoxian 4 年之前
父節點
當前提交
a9ac247d32

+ 4 - 31
module-common/src/main/java/cn/com/ctop/common/module/entity/MaterialAscription.java

@@ -3,12 +3,7 @@ package cn.com.ctop.common.module.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.util.Date;
 
@@ -21,56 +16,34 @@ import java.util.Date;
  */
 @Data
 @TableName("ctop_material_ascription")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_material_ascription对象", description = "素材归属标")
 public class MaterialAscription {
 
-    /**
-     * id
-     */
     @TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "id")
     private String id;
     /**
      * 素材库id
      */
-    @Excel(name = "素材库id", width = 15)
-    @ApiModelProperty(value = "素材库id")
     private String materialId;
     /**
      * 剪辑人id
      */
-    @Excel(name = "剪辑人id", width = 15)
-    @ApiModelProperty(value = "剪辑人id")
     private String clipId;
+    private String clipName;
     /**
      * 拍摄人id
      */
-    @Excel(name = "拍摄人id", width = 15)
-    @ApiModelProperty(value = "拍摄人id")
     private String shotId;
+    private String shotName;
     /**
      * 策划id
      */
-    @Excel(name = "策划id", width = 15)
-    @ApiModelProperty(value = "策划id")
     private String planId;
+    private String planName;
     /**
      * 平面id
      */
-    @Excel(name = "平面id", width = 15)
-    @ApiModelProperty(value = "平面id")
     private String planeId;
-
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
+    private String code;
     private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
     private Date updateTime;
 }

+ 6 - 6
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -3,10 +3,7 @@ package cn.com.ctop.common.module.service.impl;
 import cn.com.ctop.common.module.constant.CosConstant;
 import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.enums.MaterialSupplierEnum;
-import cn.com.ctop.common.module.mapper.MaterialAscriptionMapper;
-import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
-import cn.com.ctop.common.module.mapper.MaterialParameterMapper;
-import cn.com.ctop.common.module.mapper.MaterialTagMapper;
+import cn.com.ctop.common.module.mapper.*;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.*;
 import com.alibaba.fastjson.JSONArray;
@@ -502,7 +499,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         Map<String, Object> resultMap = new HashMap<>();
         try {
             String type = json.getString("type");
-
             String url = "";
             if (!Check.isNull(json.getString("url"))) {
                 url = "https:" + json.getString("url");
@@ -569,10 +565,14 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
             if (!Check.isNull(ascription)) {
                 MaterialAscription materialAscription = new MaterialAscription();
                 materialAscription.setMaterialId(info.getCode());
-                materialAscription.setClipId(ascription.getString("clipId"));
+                String clipId = ascription.getString("clipId");
+                if(null!=clipId&&!"".equals(clipId.trim())){
+                    materialAscription.setClipId(clipId);
+                }
                 materialAscription.setShotId(ascription.getString("shotId"));
                 materialAscription.setPlanId(ascription.getString("planId"));
                 materialAscription.setPlaneId(ascription.getString("planeId"));
+                materialAscription.setCode(info.getCode());
                 materialAscriptionMapper.deleteByMap(deleteMap);
                 int result = materialAscriptionMapper.insert(materialAscription);
                 if (result > 0) {

+ 18 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/RuleKuaiShouPlanServiceImpl.java

@@ -231,14 +231,27 @@ public class RuleKuaiShouPlanServiceImpl extends ServiceImpl<RuleDatePlanKuaisho
         }
     }
 
+    /**
+     * 53:提交线索,form_count
+     * 180:激活,activation
+     * 190: 付费,event_pay
+     * 191:首日ROI,event_pay_roi
+     * 348:有效线索,event_valid_clues
+     * 383: 授信,event_credit_grant_app
+     * 384: 完件 event_jin_jian_app
+     * 715:微信复制 event_add_wechat
+     * @param ocpxActionType
+     * @param detail
+     * @return
+     */
     private Long handleConvertNum(int ocpxActionType,JSONObject detail){
         Long convertNum=null;
         switch (ocpxActionType){
             case 2:
-                convertNum=detail.getLong("submit");
+                convertNum=detail.getLong("bclick");
                 break;
             case 10:
-                convertNum=detail.getLong("show");
+                convertNum=detail.getLong("aclick");
                 break;
             case 11:
                 convertNum=detail.getLong("photo_click");
@@ -247,7 +260,7 @@ public class RuleKuaiShouPlanServiceImpl extends ServiceImpl<RuleDatePlanKuaisho
                 convertNum=detail.getLong("download_completed");
                 break;
             case 53:
-                convertNum=detail.getLong("event_valid_clues");
+                convertNum=detail.getLong("form_count");
                 break;
             case 180:
                 convertNum=detail.getLong("activation");
@@ -262,10 +275,10 @@ public class RuleKuaiShouPlanServiceImpl extends ServiceImpl<RuleDatePlanKuaisho
                 convertNum=detail.getLong("event_valid_clues");
                 break;
             case 383:
-                convertNum=detail.getLong("event_credit_grant_landing_page");
+                convertNum=detail.getLong("event_credit_grant_app");
                 break;
             case 384:
-                convertNum=detail.getLong("event_jin_jian_landing_page");
+                convertNum=detail.getLong("event_jin_jian_app");
                 break;
             case 715:
                 convertNum=detail.getLong("event_add_wechat");