瀏覽代碼

加速探索初版,修改报表入库

zhaoxian 3 年之前
父節點
當前提交
f2b74b2080

+ 1 - 7
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyExplore.java

@@ -31,7 +31,7 @@ public class KuaishouReportDailyExplore {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
     private Long id;
     /**
@@ -47,12 +47,6 @@ public class KuaishouReportDailyExplore {
     @ApiModelProperty(value = "计划ID")
     private Long campaignId;
     /**
-     * 计划名称
-     */
-    @Excel(name = "计划名称", width = 15)
-    @ApiModelProperty(value = "计划名称")
-    private String campaignName;
-    /**
      * 组ID
      */
     @Excel(name = "组ID", width = 15)

+ 8 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouGroupExploreServiceImpl.java

@@ -2,6 +2,7 @@ package cn.com.ctop.kuaishou.modules.report.service.impl;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.utils.BigDecimalUtil;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.HttpUtils;
 import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
@@ -216,10 +217,17 @@ public class KuaishouGroupExploreServiceImpl extends ServiceImpl<KuaishouGroupEx
                     if (!Check.isNull(one)) {
                         kuaishouGroupExplore.setId(one.getId());
                     }
+                    KuaiShouGroup kuaiShouGroup = kuaiShouGroupService.selectGroupByUnitId(accountId, unitId);
+                    if(!Check.isNull(kuaiShouGroup)){
+                        kuaishouGroupExplore.setUnitName(kuaiShouGroup.getUnitName());
+                        kuaishouGroupExplore.setCampaignId(kuaiShouGroup.getCampaignId());
+                    }
                     kuaishouGroupExplore.setAccountId(accountId);
                     kuaishouGroupExplore.setExploreStatus(exploreStatus);
                     kuaishouGroupExplore.setMaxExploreBudget(maxExploreBudget);
                     kuaishouGroupExplore.setStatDate(new Date());
+                    kuaishouGroupExplore.setExploreBudget(BigDecimalUtil.divideBigDecimal(kuaishouGroupExplore.getExploreBudget(), new BigDecimal(1000)));
+                    kuaishouGroupExplore.setTotalCharge(BigDecimalUtil.divideBigDecimal(kuaishouGroupExplore.getTotalCharge(), new BigDecimal(1000)));
                     boolean b = dailyExploreService.saveOrUpdate(kuaishouGroupExplore);
                     if (b) {
                         return Result.ok("添加成功");