yumeng %!s(int64=5) %!d(string=hai) anos
pai
achega
c3325f1de1
Modificáronse 15 ficheiros con 273 adicións e 287 borrados
  1. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaishouInterfaceService.java
  2. 15 15
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  3. 66 124
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyAccount.java
  4. 183 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyAccountNew.java
  5. 0 125
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyAccountOld.java
  6. 3 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/KuaishouReportDailyAccountMapper.java
  7. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyAccountMapper.xml
  8. 1 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouReportDailyAccountService.java
  9. 0 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouReportDailyCampaignService.java
  10. 0 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouReportDailyCreativeService.java
  11. 0 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouReportDailyGroupService.java
  12. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyAccountServiceImpl.java
  13. 0 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyCampaignServiceImpl.java
  14. 0 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyCreativeServiceImpl.java
  15. 0 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyGroupServiceImpl.java

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

@@ -22,7 +22,7 @@ import java.util.Map;
 public interface IKuaishouInterfaceService {
     KuaishouResult<KuaishouReportHourlyAccount> getAccountHourlyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum);
 
-    KuaishouResult<KuaishouReportDailyAccount> getAccountDailyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum);
+    KuaishouResult<KuaishouReportDailyAccountNew> getAccountDailyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum);
 
     KuaishouResult<KuaishouReportDailyCampaign> getCampaignDailyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum);
 

+ 15 - 15
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -376,8 +376,18 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         }
 
         for (int i = 0; i < details.size(); i++) {
-
             JSONObject detailJson = details.getJSONObject(i);
+
+            var show = detailJson.getLong("show");
+            detailJson.put("photo_show", show);
+            var like = detailJson.getLong("like");
+            detailJson.put("photo_like", like);
+            var KuaishouReportDailyAccountOld = JSONObject.toJavaObject(detailJson, KuaishouReportDailyAccount.class);
+            KuaishouReportDailyAccountOld.setAccountId(token.getAccountId());
+            KuaishouReportDailyAccountOld.setId("" + token.getAccountId() + KuaishouReportDailyAccountOld.getStatDate());
+            dailyAccountService.saveOrUpdate(KuaishouReportDailyAccountOld);
+
+
             if (!Check.isNull(detailJson)) {
                 detailJson.put("photo_share", detailJson.getString("share"));
                 detailJson.put("photo_comment", detailJson.getString("comment"));
@@ -389,29 +399,19 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                 detailJson.remove("show");
                 detailJson.remove("adScene");
                 detailJson.remove("stat_hour");
-                KuaishouReportDailyAccount kuaishouReportDailyAccount = JsonUtil.jsonToObj(detailJson, KuaishouReportDailyAccount.class);
+                KuaishouReportDailyAccountNew kuaishouReportDailyAccount = JsonUtil.jsonToObj(detailJson, KuaishouReportDailyAccountNew.class);
                 kuaishouReportDailyAccount.setAccountId(token.getAccountId());
                 dailyAccountMapper.insertSelective(kuaishouReportDailyAccount);
 
             }
 
 
-
-
-            var show = detailJson.getLong("show");
-            detailJson.put("photo_show", show);
-            var like = detailJson.getLong("like");
-            detailJson.put("photo_like", like);
-            var KuaishouReportDailyAccountOld = JSONObject.toJavaObject(detailJson, KuaishouReportDailyAccountOld.class);
-            KuaishouReportDailyAccountOld.setAccountId(token.getAccountId());
-            KuaishouReportDailyAccountOld.setId("" + token.getAccountId() + KuaishouReportDailyAccountOld.getStatDate());
-            dailyAccountService.saveOrUpdate(KuaishouReportDailyAccountOld);
         }
         getAccountDailyReportByPage(token, startDate, endDate, page + 1);
     }
 
     @Override
-    public KuaishouResult<KuaishouReportDailyAccount> getAccountDailyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum) {
+    public KuaishouResult<KuaishouReportDailyAccountNew> getAccountDailyReport(String accessToken, Long advertiserId, String startDate, String endDate, int pageSize, int pageNum) {
         String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.ACCOUNT_REPORT;
         Map<String, String> headers = new HashMap<String, String>();
         headers.put("Content-Type", "application/json");
@@ -444,10 +444,10 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                             detailJson.put("photo_show", show);
                             Long like = detailJson.getLong("like");
                             detailJson.put("photo_like", like);
-                            KuaishouReportDailyAccount kuaishouReportDailyAccount = JSONObject.toJavaObject(detailJson, KuaishouReportDailyAccount.class);
+                            KuaishouReportDailyAccountNew kuaishouReportDailyAccount = JSONObject.toJavaObject(detailJson, KuaishouReportDailyAccountNew.class);
                             kuaishouReportDailyAccount.setAccountId(advertiserId);
                             kuaishouReportDailyAccount.setId("" + advertiserId + kuaishouReportDailyAccount.getStatDate());
-                            dailyAccountService.saveOrUpdate(kuaishouReportDailyAccount);
+                            //dailyAccountService.saveOrUpdate(kuaishouReportDailyAccount);
                         }
                     }
                 }

+ 66 - 124
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouReportDailyAccount.java

@@ -1,8 +1,8 @@
 package cn.com.ctop.kuaishou.modules.report.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -10,10 +10,8 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-
 @Data
 @TableName("ctop_kuaishou_report_daily_account")
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class KuaishouReportDailyAccount implements Serializable {
     private static final long serialVersionUID = 1L;
     @TableId
@@ -21,163 +19,107 @@ public class KuaishouReportDailyAccount implements Serializable {
 
     private Long accountId;
 
-    @JsonProperty("charge")
+    @JsonProperty("stat_date")
+    private String statDate;
+
+    @JsonProperty
     private BigDecimal charge;
 
-    @JsonProperty("photo_show")
+    @JsonProperty
     private Long photoShow;
 
-    @JsonProperty("aclick")
-    private Long aclick;
+    @JsonProperty("photo_click")
+    private Long photoClick;
 
-    @JsonProperty("bclick")
+    @JsonProperty
+    private Long aclick;
+    @JsonProperty
     private Long bclick;
-
-    @JsonProperty("photo_share")
-    private Long photoShare;
-
-    @JsonProperty("photo_comment")
-    private Long photoComment;
-
-    @JsonProperty("photo_like")
+    @JsonProperty
+    private Long share;
+    @JsonProperty
+    private Long comment;
+    @JsonProperty
     private Long photoLike;
-
-    @JsonProperty("follow")
+    @JsonProperty
     private Long follow;
-
     @JsonProperty("cancel_follow")
     private Long cancelFollow;
-
-    @JsonProperty("report")
+    @JsonProperty
     private Long report;
-
-    @JsonProperty("block")
+    @JsonProperty
     private Long block;
-
-    @JsonProperty("negative")
+    @JsonProperty
     private Long negative;
-
+    @JsonProperty
+    private Long submit;
     @JsonProperty("download_started")
     private Long downloadStarted;
-
     @JsonProperty("download_completed")
     private Long downloadCompleted;
-
-    @JsonProperty("activation")
+    @JsonProperty
     private Long activation;
 
-    @JsonProperty("submit")
-    private Long submit;
-
-    @JsonProperty("stat_date")
-    private String statDate;
-
-    @JsonProperty("photo_click")
-    private Long photoClick;
-
-    @JsonProperty("photo_click_ratio")
-    private Double photoClickRatio;
-
-    @JsonProperty("action_ratio")
-    private Double actionRatio;
-
+    @JsonProperty
+    private BigDecimal photoClickRatio;
+    @JsonProperty
+    private BigDecimal actionRatio;
     @JsonProperty("impression_1k_cost")
+    @TableField("impression_1k_cost")
     private BigDecimal impression1kCost;
-
-    @JsonProperty("photo_click_cost")
+    @JsonProperty
     private BigDecimal photoClickCost;
-
-    @JsonProperty("action_cost")
+    @JsonProperty
     private BigDecimal actionCost;
-
-    @JsonProperty("event_pay_first_day")
+    @JsonProperty
     private Long eventPayFirstDay;
-
-    @JsonProperty("event_pay_purchase_amount_first_day")
-    private BigDecimal eventPayPurchaseAmountFirstDay;
-
-    @JsonProperty("event_pay_first_day_roi")
-    private Double eventPayFirstDayRoi;
-
-    @JsonProperty("event_pay")
-    private Long eventPay;
-
-    @JsonProperty("event_pay_purchase_amount")
+    @JsonProperty
+    private BigDecimal eventPayFirstDayRoi;
+    @JsonProperty
+    private BigDecimal eventPay;
+    @JsonProperty
     private BigDecimal eventPayPurchaseAmount;
-
-    @JsonProperty("event_pay_roi")
-    private Double eventPayRoi;
-
-    @JsonProperty("event_register")
+    @JsonProperty
+    private BigDecimal eventPayRoi;
+    @JsonProperty
     private Long eventRegister;
-
-    @JsonProperty("event_register_cost")
+    @JsonProperty
     private BigDecimal eventRegisterCost;
-
-    @JsonProperty("event_register_ratio")
-    private Double eventRegisterRatio;
-
-    @JsonProperty("event_jin_jian_app")
+    @JsonProperty
     private Long eventJinJianApp;
-
-    @JsonProperty("event_jin_jian_app_cost")
+    @JsonProperty
     private BigDecimal eventJinJianAppCost;
-
-    @JsonProperty("event_credit_grant_app")
+    @JsonProperty
+    private BigDecimal eventPayPurchaseAmountFirstDay;
+    @JsonProperty
     private Long eventCreditGrantApp;
-
-    @JsonProperty("event_credit_grant_app_cost")
+    @JsonProperty
     private BigDecimal eventCreditGrantAppCost;
-
-    @JsonProperty("event_credit_grant_app_ratio")
-    private Double eventCreditGrantAppRatio;
-
-    @JsonProperty("event_order_paid")
-    private Long eventOrderPaid;
-
-    @JsonProperty("event_order_paid_purchase_amount")
+    @JsonProperty
+    private BigDecimal eventCreditGrantAppRatio;
+    @JsonProperty
+    private BigDecimal eventOrderPaid;
+    @JsonProperty
     private BigDecimal eventOrderPaidPurchaseAmount;
-
-    @JsonProperty("event_jin_jian_landing_page")
+    @JsonProperty
+    private BigDecimal eventOrderPaidCost;
+    @JsonProperty
+    private Long formCount;
+    @JsonProperty
+    private BigDecimal formCost;
+    @JsonProperty
+    private BigDecimal formActionRatio;
+    @JsonProperty
     private Long eventJinJianLandingPage;
-
-    @JsonProperty("event_jin_jian_landing_page_cost")
+    @JsonProperty
     private BigDecimal eventJinJianLandingPageCost;
-
-    @JsonProperty("event_credit_grant_landing_page")
+    @JsonProperty
     private Long eventCreditGrantLandingPage;
-
-    @JsonProperty("event_credit_grant_landing_page_cost")
+    @JsonProperty
     private BigDecimal eventCreditGrantLandingPageCost;
-
-    @JsonProperty("event_credit_grant_landing_ratio")
-    private Double eventCreditGrantLandingRatio;
-
-    @JsonProperty("event_next_day_stay_cost")
-    private BigDecimal eventNextDayStayCost;
-
-    @JsonProperty("event_next_day_stay_ratio")
-    private Long eventNextDayStayRatio;
-
-    @JsonProperty("form_action_ratio")
-    private Double formActionRatio;
-
-    @JsonProperty("event_order_paid_cost")
-    private BigDecimal eventOrderPaidCost;
-
-    @JsonProperty("event_next_day_stay")
-    private Long eventNextDayStay;
-
-    @JsonProperty("form_cost")
-    private BigDecimal formCost;
-
-    @JsonProperty("form_count")
-    private Long formCount;
-
-    @JsonProperty("play_3s_ratio")
-    private Double play3sRatio;
-
+    @JsonProperty
     private Date createTime;
-
+    @JsonProperty
     private Date updateTime;
 }
+

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

@@ -0,0 +1,183 @@
+package cn.com.ctop.kuaishou.modules.report.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+@TableName("ctop_kuaishou_report_daily_account")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class KuaishouReportDailyAccountNew implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @TableId
+    private String id;
+
+    private Long accountId;
+
+    @JsonProperty("charge")
+    private BigDecimal charge;
+
+    @JsonProperty("photo_show")
+    private Long photoShow;
+
+    @JsonProperty("aclick")
+    private Long aclick;
+
+    @JsonProperty("bclick")
+    private Long bclick;
+
+    @JsonProperty("photo_share")
+    private Long photoShare;
+
+    @JsonProperty("photo_comment")
+    private Long photoComment;
+
+    @JsonProperty("photo_like")
+    private Long photoLike;
+
+    @JsonProperty("follow")
+    private Long follow;
+
+    @JsonProperty("cancel_follow")
+    private Long cancelFollow;
+
+    @JsonProperty("report")
+    private Long report;
+
+    @JsonProperty("block")
+    private Long block;
+
+    @JsonProperty("negative")
+    private Long negative;
+
+    @JsonProperty("download_started")
+    private Long downloadStarted;
+
+    @JsonProperty("download_completed")
+    private Long downloadCompleted;
+
+    @JsonProperty("activation")
+    private Long activation;
+
+    @JsonProperty("submit")
+    private Long submit;
+
+    @JsonProperty("stat_date")
+    private String statDate;
+
+    @JsonProperty("photo_click")
+    private Long photoClick;
+
+    @JsonProperty("photo_click_ratio")
+    private Double photoClickRatio;
+
+    @JsonProperty("action_ratio")
+    private Double actionRatio;
+
+    @JsonProperty("impression_1k_cost")
+    private BigDecimal impression1kCost;
+
+    @JsonProperty("photo_click_cost")
+    private BigDecimal photoClickCost;
+
+    @JsonProperty("action_cost")
+    private BigDecimal actionCost;
+
+    @JsonProperty("event_pay_first_day")
+    private Long eventPayFirstDay;
+
+    @JsonProperty("event_pay_purchase_amount_first_day")
+    private BigDecimal eventPayPurchaseAmountFirstDay;
+
+    @JsonProperty("event_pay_first_day_roi")
+    private Double eventPayFirstDayRoi;
+
+    @JsonProperty("event_pay")
+    private Long eventPay;
+
+    @JsonProperty("event_pay_purchase_amount")
+    private BigDecimal eventPayPurchaseAmount;
+
+    @JsonProperty("event_pay_roi")
+    private Double eventPayRoi;
+
+    @JsonProperty("event_register")
+    private Long eventRegister;
+
+    @JsonProperty("event_register_cost")
+    private BigDecimal eventRegisterCost;
+
+    @JsonProperty("event_register_ratio")
+    private Double eventRegisterRatio;
+
+    @JsonProperty("event_jin_jian_app")
+    private Long eventJinJianApp;
+
+    @JsonProperty("event_jin_jian_app_cost")
+    private BigDecimal eventJinJianAppCost;
+
+    @JsonProperty("event_credit_grant_app")
+    private Long eventCreditGrantApp;
+
+    @JsonProperty("event_credit_grant_app_cost")
+    private BigDecimal eventCreditGrantAppCost;
+
+    @JsonProperty("event_credit_grant_app_ratio")
+    private Double eventCreditGrantAppRatio;
+
+    @JsonProperty("event_order_paid")
+    private Long eventOrderPaid;
+
+    @JsonProperty("event_order_paid_purchase_amount")
+    private BigDecimal eventOrderPaidPurchaseAmount;
+
+    @JsonProperty("event_jin_jian_landing_page")
+    private Long eventJinJianLandingPage;
+
+    @JsonProperty("event_jin_jian_landing_page_cost")
+    private BigDecimal eventJinJianLandingPageCost;
+
+    @JsonProperty("event_credit_grant_landing_page")
+    private Long eventCreditGrantLandingPage;
+
+    @JsonProperty("event_credit_grant_landing_page_cost")
+    private BigDecimal eventCreditGrantLandingPageCost;
+
+    @JsonProperty("event_credit_grant_landing_ratio")
+    private Double eventCreditGrantLandingRatio;
+
+    @JsonProperty("event_next_day_stay_cost")
+    private BigDecimal eventNextDayStayCost;
+
+    @JsonProperty("event_next_day_stay_ratio")
+    private Long eventNextDayStayRatio;
+
+    @JsonProperty("form_action_ratio")
+    private Double formActionRatio;
+
+    @JsonProperty("event_order_paid_cost")
+    private BigDecimal eventOrderPaidCost;
+
+    @JsonProperty("event_next_day_stay")
+    private Long eventNextDayStay;
+
+    @JsonProperty("form_cost")
+    private BigDecimal formCost;
+
+    @JsonProperty("form_count")
+    private Long formCount;
+
+    @JsonProperty("play_3s_ratio")
+    private Double play3sRatio;
+
+    private Date createTime;
+
+    private Date updateTime;
+}

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

@@ -1,125 +0,0 @@
-package cn.com.ctop.kuaishou.modules.report.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@TableName("ctop_kuaishou_report_daily_account")
-public class KuaishouReportDailyAccountOld implements Serializable {
-    private static final long serialVersionUID = 1L;
-    @TableId
-    private String id;
-
-    private Long accountId;
-
-    @JsonProperty("stat_date")
-    private String statDate;
-
-    @JsonProperty
-    private BigDecimal charge;
-
-    @JsonProperty
-    private Long photoShow;
-
-    @JsonProperty("photo_click")
-    private Long photoClick;
-
-    @JsonProperty
-    private Long aclick;
-    @JsonProperty
-    private Long bclick;
-    @JsonProperty
-    private Long share;
-    @JsonProperty
-    private Long comment;
-    @JsonProperty
-    private Long photoLike;
-    @JsonProperty
-    private Long follow;
-    @JsonProperty("cancel_follow")
-    private Long cancelFollow;
-    @JsonProperty
-    private Long report;
-    @JsonProperty
-    private Long block;
-    @JsonProperty
-    private Long negative;
-    @JsonProperty
-    private Long submit;
-    @JsonProperty("download_started")
-    private Long downloadStarted;
-    @JsonProperty("download_completed")
-    private Long downloadCompleted;
-    @JsonProperty
-    private Long activation;
-
-    @JsonProperty
-    private BigDecimal photoClickRatio;
-    @JsonProperty
-    private BigDecimal actionRatio;
-    @JsonProperty("impression_1k_cost")
-    @TableField("impression_1k_cost")
-    private BigDecimal impression1kCost;
-    @JsonProperty
-    private BigDecimal photoClickCost;
-    @JsonProperty
-    private BigDecimal actionCost;
-    @JsonProperty
-    private Long eventPayFirstDay;
-    @JsonProperty
-    private BigDecimal eventPayFirstDayRoi;
-    @JsonProperty
-    private BigDecimal eventPay;
-    @JsonProperty
-    private BigDecimal eventPayPurchaseAmount;
-    @JsonProperty
-    private BigDecimal eventPayRoi;
-    @JsonProperty
-    private Long eventRegister;
-    @JsonProperty
-    private BigDecimal eventRegisterCost;
-    @JsonProperty
-    private Long eventJinJianApp;
-    @JsonProperty
-    private BigDecimal eventJinJianAppCost;
-    @JsonProperty
-    private BigDecimal eventPayPurchaseAmountFirstDay;
-    @JsonProperty
-    private Long eventCreditGrantApp;
-    @JsonProperty
-    private BigDecimal eventCreditGrantAppCost;
-    @JsonProperty
-    private BigDecimal eventCreditGrantAppRatio;
-    @JsonProperty
-    private BigDecimal eventOrderPaid;
-    @JsonProperty
-    private BigDecimal eventOrderPaidPurchaseAmount;
-    @JsonProperty
-    private BigDecimal eventOrderPaidCost;
-    @JsonProperty
-    private Long formCount;
-    @JsonProperty
-    private BigDecimal formCost;
-    @JsonProperty
-    private BigDecimal formActionRatio;
-    @JsonProperty
-    private Long eventJinJianLandingPage;
-    @JsonProperty
-    private BigDecimal eventJinJianLandingPageCost;
-    @JsonProperty
-    private Long eventCreditGrantLandingPage;
-    @JsonProperty
-    private BigDecimal eventCreditGrantLandingPageCost;
-    @JsonProperty
-    private Date createTime;
-    @JsonProperty
-    private Date updateTime;
-}
-

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

@@ -1,12 +1,12 @@
 package cn.com.ctop.kuaishou.modules.report.mapper;
 
+import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountNew;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccount;
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountOld;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
-public interface KuaishouReportDailyAccountMapper extends BaseMapper<KuaishouReportDailyAccountOld> {
+public interface KuaishouReportDailyAccountMapper extends BaseMapper<KuaishouReportDailyAccount> {
     void loadAccountDailyReport(@Param("accountId") Long accountId, @Param("localPath") String localPath);
 
-    void insertSelective(KuaishouReportDailyAccount dailyAccount);
+    void insertSelective(KuaishouReportDailyAccountNew dailyAccount);
 }

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper">
 
-    <resultMap id="BaseResultMap" type="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccount">
+    <resultMap id="BaseResultMap" type="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountNew">
         <id column="id" property="id" jdbcType="BIGINT"/>
         <result column="account_id" property="account_id" jdbcType="BIGINT"/>
         <result column="charge" property="charge" jdbcType="DECIMAL"/>
@@ -82,7 +82,7 @@
   </sql>
 
 
-    <insert id="insertSelective" parameterType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccount">
+    <insert id="insertSelective" parameterType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountNew">
         replace into ctop_kuaishou_report_daily_account_new
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">

+ 1 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouReportDailyAccountService.java

@@ -1,9 +1,7 @@
 package cn.com.ctop.kuaishou.modules.report.service;
 
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccount;
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountOld;
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportHourlyAccount;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-public interface IKuaishouReportDailyAccountService extends IService<KuaishouReportDailyAccountOld> {
+public interface IKuaishouReportDailyAccountService extends IService<KuaishouReportDailyAccount> {
 }

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

@@ -1,6 +1,5 @@
 package cn.com.ctop.kuaishou.modules.report.service;
 
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccount;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCampaign;
 import com.baomidou.mybatisplus.extension.service.IService;
 

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

@@ -1,6 +1,5 @@
 package cn.com.ctop.kuaishou.modules.report.service;
 
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccount;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCreative;
 import com.baomidou.mybatisplus.extension.service.IService;
 

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

@@ -1,6 +1,5 @@
 package cn.com.ctop.kuaishou.modules.report.service;
 
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccount;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyGroup;
 import com.baomidou.mybatisplus.extension.service.IService;
 

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyAccountServiceImpl.java

@@ -1,11 +1,11 @@
 package cn.com.ctop.kuaishou.modules.report.service.impl;
 
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountOld;
+import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccount;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAccountService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 @Service
-public class KuaishouReportDailyAccountServiceImpl extends ServiceImpl<KuaishouReportDailyAccountMapper, KuaishouReportDailyAccountOld> implements IKuaishouReportDailyAccountService {
+public class KuaishouReportDailyAccountServiceImpl extends ServiceImpl<KuaishouReportDailyAccountMapper, KuaishouReportDailyAccount> implements IKuaishouReportDailyAccountService {
 }

+ 0 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyCampaignServiceImpl.java

@@ -1,10 +1,7 @@
 package cn.com.ctop.kuaishou.modules.report.service.impl;
 
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccount;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCampaign;
-import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCampaignMapper;
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAccountService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyCampaignService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;

+ 0 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyCreativeServiceImpl.java

@@ -1,10 +1,7 @@
 package cn.com.ctop.kuaishou.modules.report.service.impl;
 
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccount;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCreative;
-import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCreativeMapper;
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAccountService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyCreativeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;

+ 0 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyGroupServiceImpl.java

@@ -1,10 +1,7 @@
 package cn.com.ctop.kuaishou.modules.report.service.impl;
 
-import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccount;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyGroup;
-import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyGroupMapper;
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAccountService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyGroupService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;