Browse Source

Merge remote-tracking branch 'origin/test' into test

jiequan.bi 4 years ago
parent
commit
b3f9773cd6

+ 3 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/entity/WpsFile.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.wps.entity;
 package org.jeecg.modules.wps.entity;
 
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -40,8 +41,7 @@ public class WpsFile {
     @ApiModelProperty(value = "size")
     @ApiModelProperty(value = "size")
 	private Integer size;
 	private Integer size;
 	/**creator*/
 	/**creator*/
-	@Excel(name = "creator", width = 15)
-    @ApiModelProperty(value = "creator")
+	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
     private String creator;
     private String creator;
 	/**createTime*/
 	/**createTime*/
 	@Excel(name = "createTime", width = 15)
 	@Excel(name = "createTime", width = 15)
@@ -60,13 +60,10 @@ public class WpsFile {
     @ApiModelProperty(value = "downloadUrl")
     @ApiModelProperty(value = "downloadUrl")
 	private String downloadUrl;
 	private String downloadUrl;
 	/**deleted*/
 	/**deleted*/
-	@Excel(name = "deleted", width = 15)
-    @ApiModelProperty(value = "deleted")
 	private String deleted;
 	private String deleted;
 	/**canDelete*/
 	/**canDelete*/
-	@Excel(name = "canDelete", width = 15)
-    @ApiModelProperty(value = "canDelete")
 	private String canDelete;
 	private String canDelete;
+	@Dict(dicCode = "id",dictTable="ctop_project",dicText="project_name")
 	private Long projectId;
 	private Long projectId;
 
 
 	private String code;
 	private String code;

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyAccountDTO.java

@@ -50,4 +50,5 @@ public class KuaishouReportDailyAccountDTO implements Serializable {
     private Long photoId;
     private Long photoId;
     private String url;
     private String url;
     private String coverUrl;
     private String coverUrl;
+    private Integer materialType;
 }
 }

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

@@ -691,6 +691,7 @@
                 #{item}
                 #{item}
             </foreach>
             </foreach>
             group by b.project_id
             group by b.project_id
+            order by sum(a.charge) desc
         ) m
         ) m
         <if test="yn = 1">
         <if test="yn = 1">
         where
         where
@@ -776,6 +777,7 @@
         </if>
         </if>
 
 
         group by a.campaign_id
         group by a.campaign_id
+        order by sum(a.charge) desc
         ) m
         ) m
 
 
         <if test="yn = 1">
         <if test="yn = 1">
@@ -864,6 +866,7 @@
                 </foreach>
                 </foreach>
             </if>
             </if>
             group by unit_id
             group by unit_id
+            order by sum(a.charge) desc
             ) m
             ) m
         <if test="yn = 1">
         <if test="yn = 1">
             where
             where
@@ -1025,7 +1028,8 @@
             end
             end
             ) as 'eventNextDayStayCost',  -- 次日留存成本
             ) as 'eventNextDayStayCost',  -- 次日留存成本
             (select url from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as url,
             (select url from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as url,
-            (select cover_url from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as coverUrl
+            (select cover_url from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as coverUrl,
+            (select material_type from ctop_kuaishou_video_get where photo_id = c.photo_id limit 1) as materialType
             from
             from
             ctop_kuaishou_report_daily_creative a
             ctop_kuaishou_report_daily_creative a
             left join (select * from ctop_user_allocation group by account_id) b on a.account_id = b.account_id
             left join (select * from ctop_user_allocation group by account_id) b on a.account_id = b.account_id
@@ -1047,6 +1051,7 @@
                 </foreach>
                 </foreach>
             </if>
             </if>
             group by a.creative_id
             group by a.creative_id
+            order by sum(a.charge) desc
         )m
         )m
         <if test="yn=1">
         <if test="yn=1">
             where m.charge != 0
             where m.charge != 0

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

@@ -180,12 +180,12 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             log.info("广告创意创建失败,accountId:{},message:{}", accountId, message);
             log.info("广告创意创建失败,accountId:{},message:{}", accountId, message);
             resultMap.put("success", false);
             resultMap.put("success", false);
             resultMap.put("code", -1);
             resultMap.put("code", -1);
-            resultMap.put("message", message);
+            resultMap.put("message", "广告计划("+adId+"):"+message);
             return resultMap;
             return resultMap;
         }
         }
         resultMap.put("success", true);
         resultMap.put("success", true);
         resultMap.put("code", 0);
         resultMap.put("code", 0);
-        resultMap.put("message", "广告创意创建成功");
+        resultMap.put("message", "广告计划("+adId+"):"+"创意创建成功");
         return resultMap;
         return resultMap;
     }
     }
 
 
@@ -295,6 +295,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             array.add(getData);
             array.add(getData);
         }
         }
         result.put("data",array);
         result.put("data",array);
+        ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
         return result;
         return result;
     }
     }
 
 
@@ -528,8 +529,13 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
                     }
                     }
                     JSONArray dpaDictIds = creativeObject.getJSONArray("dpaDictIds");
                     JSONArray dpaDictIds = creativeObject.getJSONArray("dpaDictIds");
                     creativeObject.remove("dpaDictIds");
                     creativeObject.remove("dpaDictIds");
-                    if(null!=creativeWordIds&&!creativeWordIds.isEmpty()){
-                        creativeObject.put("creative_word_ids",creativeWordIds);
+                    if(null!=dpaDictIds&&!dpaDictIds.isEmpty()){
+                        creativeObject.put("dpa_dict_ids",dpaDictIds);
+                    }
+                    String text = creativeObject.getString("text");
+                    creativeObject.remove("text");
+                    if(null!=text&&!"".equals(text.trim())){
+                        creativeObject.put("title",text);
                     }
                     }
                     Integer derivePosterCid = creativeObject.getInteger("derivePosterCid");
                     Integer derivePosterCid = creativeObject.getInteger("derivePosterCid");
                     creativeObject.remove("derivePosterCid");
                     creativeObject.remove("derivePosterCid");