浏览代码

鱼夫睿选

yumeng 10 月之前
父节点
当前提交
38efd2786b
共有 17 个文件被更改,包括 218 次插入774 次删除
  1. 2 0
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KFXAccessTokenJob.java
  2. 0 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaishouSupplyChainMapper.java
  3. 8 7
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/MgsSupplyChainMapper.java
  4. 0 7
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/RocketSupplyChainMapper.java
  5. 0 7
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/YufuSupplyChainMapper.java
  6. 0 15
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaishouSupplyChainMapper.xml
  7. 198 97
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/MgsSupplyChainMapper.xml
  8. 1 174
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/RocketSupplyChainMapper.xml
  9. 1 106
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/YufuSupplyChainMapper.xml
  10. 0 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaishouSupplyChainService.java
  11. 2 15
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IMgsSupplyChainService.java
  12. 0 7
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/RocketSupplyChainService.java
  13. 0 13
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/YufuSupplyChainService.java
  14. 0 57
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouSupplyChainServiceImpl.java
  15. 6 83
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/MgsSupplyChainServiceImpl.java
  16. 0 89
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/RocketSupplyChainServiceImpl.java
  17. 0 95
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/YufuSupplyChainServiceImpl.java

+ 2 - 0
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KFXAccessTokenJob.java

@@ -14,6 +14,8 @@ public class KFXAccessTokenJob {
         HttpUtils2.httpGet(mgsUrl, null, null);
         String rocketUrl = "http://rocket.api.tjyourong.com.cn/item/accessToken";
         HttpUtils2.httpGet(rocketUrl, null, null);
+        String yufuUrl = "http://yufu.api.tjyourong.com.cn/item/accessToken";
+        HttpUtils2.httpGet(yufuUrl, null, null);
 
     }
 

+ 0 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaishouSupplyChainMapper.java

@@ -21,7 +21,6 @@ public interface KuaishouSupplyChainMapper extends BaseMapper<KuaishouSupplyChai
 
     List<JSONObject>  getCookie();
 
-    void replaceSettlement(@Param(value = "adds") List<KuaishouSupplyChainSettlement> supplyChains);
 
     List<JSONObject> getDataList(@Param("statDate") Long statDate);
 

+ 8 - 7
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/MgsSupplyChainMapper.java

@@ -20,17 +20,18 @@ public interface MgsSupplyChainMapper extends BaseMapper<KuaishouSupplyChain> {
 
     List<JSONObject>  getCookie();
 
-    void replaceSettlement(@Param(value = "adds") List<KuaishouSupplyChainSettlement> supplyChains);
 
-    List<JSONObject> getDataList(@Param("statDate") Long statDate);
 
-    List<JSONObject> getPromoterDataList(@Param("statDate") Long statDate);
 
-    void deletePromoterBindChannelByDate(@Param("date") Long date);
 
-    void cleanKuaiShouPromoterBindChannel(@Param("date") Long date);
 
-    List<JSONObject> getSamplesData(@Param("startDate") String startDate);
 
-    void cleanBytedancePromoterBindChannel(@Param("date") Long date);
+
+    void replaceRuixuanSupplyChains(@Param("adds") List<KuaishouSupplyChain> ruixuanSupplyChains);
+
+    void replaceMgsSupplyChains(@Param("adds") List<KuaishouSupplyChain> mgsSupplyChains);
+
+    void replaceRocketSupplyChains(@Param("adds") List<KuaishouSupplyChain> rocketSupplyChains);
+
+    void replaceYufuSupplyChains(@Param("adds") List<KuaishouSupplyChain> yufuSupplyChains);
 }

+ 0 - 7
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/RocketSupplyChainMapper.java

@@ -17,19 +17,12 @@ public interface RocketSupplyChainMapper extends BaseMapper<KuaishouSupplyChain>
 
     List<JSONObject> getCookie();
 
-    void replaceSettlement(@Param(value = "adds") List<KuaishouSupplyChainSettlement> supplyChains);
 
-    List<JSONObject> getDataList(@Param("statDate") Long statDate);
 
-    List<JSONObject> getPromoterDataList(@Param("statDate") Long statDate);
 
-    void deletePromoterBindChannelByDate(@Param("date") Long date);
 
-    void cleanKuaiShouPromoterBindChannel(@Param("date") Long date);
 
-    List<JSONObject> getSamplesData(@Param("startDate") String startDate);
 
-    void cleanBytedancePromoterBindChannel(@Param("date") Long date);
 
     void replaceRuixuanSupplyChains(@Param(value = "adds") List<KuaishouSupplyChain> ruixuanSupplyChains);
 

+ 0 - 7
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/YufuSupplyChainMapper.java

@@ -16,19 +16,12 @@ public interface YufuSupplyChainMapper extends BaseMapper<KuaishouSupplyChain> {
 
     List<JSONObject> getCookie();
 
-    void replaceSettlement(@Param(value = "adds") List<KuaishouSupplyChainSettlement> supplyChains);
 
-    List<JSONObject> getDataList(@Param("statDate") Long statDate);
 
-    List<JSONObject> getPromoterDataList(@Param("statDate") Long statDate);
 
-    void deletePromoterBindChannelByDate(@Param("date") Long date);
 
-    void cleanKuaiShouPromoterBindChannel(@Param("date") Long date);
 
-    List<JSONObject> getSamplesData(@Param("startDate") String startDate);
 
-    void cleanBytedancePromoterBindChannel(@Param("date") Long date);
 
     void replaceRuixuanSupplyChains(@Param(value = "adds") List<KuaishouSupplyChain> ruixuanSupplyChains);
 

+ 0 - 15
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaishouSupplyChainMapper.xml

@@ -68,22 +68,7 @@
 
         </foreach>
     </insert>
-    <insert id="replaceSettlement">
-        replace into ruixuan.kuaishou_supply_chain_settlement(
-        oid,
-        settlement_amount,
-        settlement_time
 
-        )
-        values
-        <foreach collection="adds" item="add" separator=",">
-            (
-            #{add.oid},
-            #{add.settlementAmount},
-            #{add.settlementTime}
-            )
-        </foreach>
-    </insert>
     <insert id="cleanKuaiShouPromoterBindChannel" parameterType="java.lang.Long">
         insert into ruixuan.promoter_bind_channel_date (promoter_id, promoter_name,promoter_url, user_id, user_name, stat_date,media_id)
         select t1.promoter_id, t1.promoter_nick_name, t1.promoter_url,t1.user_id, t1.user_name, #{date},media_id

+ 198 - 97
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/MgsSupplyChainMapper.xml

@@ -2,7 +2,75 @@
 <!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.batch.mapper.MgsSupplyChainMapper">
 
-    <insert id="replace">
+    <insert id="replaceRuixuanSupplyChains">
+        replace into ruixuan.kuaishou_supply_chain(
+        id,
+        oid,
+        item_id,
+        item_title,
+        reserve_price,
+        image_url,
+        order_status,
+        order_create_time,
+        send_status,
+        settlement_biz_type,
+        settlement_biz_type_desc,
+        send_time,
+        recv_time,
+        seller_id,
+        promoter_id,
+        promoter_nick_name,
+        activity_id,
+        order_amount,
+        pay_amount,
+        regimental_promotion_rate,
+        share_rate,
+        base_amount,
+        service_amount,
+        regimental_promotion_amount,
+        total_regimental_settle_amount,
+        stat_date,
+        stat_hour,
+        item_commission_rate
+        )
+        values
+        <foreach collection="adds" item="add" separator=",">
+            (
+            #{add.id},
+            #{add.oid},
+            #{add.itemId},
+            #{add.itemTitle},
+            #{add.reservePrice},
+            #{add.imageUrl},
+            #{add.orderStatus},
+            #{add.orderCreateTime},
+            #{add.sendStatus},
+            #{add.settlementBizType},
+            #{add.settlementBizTypeDesc},
+            #{add.sendTime},
+            #{add.recvTime},
+            #{add.sellerId},
+            #{add.promoterId},
+            #{add.promoterNickName},
+            #{add.activityId},
+            #{add.orderAmount},
+            #{add.payAmount},
+            #{add.regimentalPromotionRate},
+            #{add.shareRate},
+            #{add.baseAmount},
+            #{add.serviceAmount},
+            #{add.regimentalPromotionAmount},
+            #{add.totalRegimentalSettleAmount},
+            #{add.statDate},
+            #{add.statHour},
+            #{add.itemCommissionRate}
+            )
+
+        </foreach>
+
+
+    </insert>
+    <insert id="replaceMgsSupplyChains">
         replace into miaogousi.kuaishou_supply_chain(
         id,
         oid,
@@ -68,120 +136,153 @@
 
         </foreach>
     </insert>
-    <insert id="replaceSettlement">
-        replace into miaogousi.kuaishou_supply_chain_settlement(
+    <insert id="replaceRocketSupplyChains">
+        replace into rocket.kuaishou_supply_chain(
+        id,
         oid,
-        settlement_amount,
-        settlement_time
+        item_id,
+        item_title,
+        reserve_price,
+        image_url,
+        order_status,
+        order_create_time,
+        send_status,
+        settlement_biz_type,
+        settlement_biz_type_desc,
+        send_time,
+        recv_time,
+        seller_id,
+        promoter_id,
+        promoter_nick_name,
+        activity_id,
+        order_amount,
+        pay_amount,
+        regimental_promotion_rate,
+        share_rate,
+        base_amount,
+        service_amount,
+        regimental_promotion_amount,
+        total_regimental_settle_amount,
+        stat_date,
+        stat_hour,
+        item_commission_rate
+        )
+        values
+        <foreach collection="adds" item="add" separator=",">
+            (
+            #{add.id},
+            #{add.oid},
+            #{add.itemId},
+            #{add.itemTitle},
+            #{add.reservePrice},
+            #{add.imageUrl},
+            #{add.orderStatus},
+            #{add.orderCreateTime},
+            #{add.sendStatus},
+            #{add.settlementBizType},
+            #{add.settlementBizTypeDesc},
+            #{add.sendTime},
+            #{add.recvTime},
+            #{add.sellerId},
+            #{add.promoterId},
+            #{add.promoterNickName},
+            #{add.activityId},
+            #{add.orderAmount},
+            #{add.payAmount},
+            #{add.regimentalPromotionRate},
+            #{add.shareRate},
+            #{add.baseAmount},
+            #{add.serviceAmount},
+            #{add.regimentalPromotionAmount},
+            #{add.totalRegimentalSettleAmount},
+            #{add.statDate},
+            #{add.statHour},
+            #{add.itemCommissionRate}
+            )
 
+        </foreach>
+
+    </insert>
+    <insert id="replaceYufuSupplyChains">
+        replace into yufu.kuaishou_supply_chain(
+        id,
+        oid,
+        item_id,
+        item_title,
+        reserve_price,
+        image_url,
+        order_status,
+        order_create_time,
+        send_status,
+        settlement_biz_type,
+        settlement_biz_type_desc,
+        send_time,
+        recv_time,
+        seller_id,
+        promoter_id,
+        promoter_nick_name,
+        activity_id,
+        order_amount,
+        pay_amount,
+        regimental_promotion_rate,
+        share_rate,
+        base_amount,
+        service_amount,
+        regimental_promotion_amount,
+        total_regimental_settle_amount,
+        stat_date,
+        stat_hour,
+        item_commission_rate
         )
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.id},
             #{add.oid},
-            #{add.settlementAmount},
-            #{add.settlementTime}
+            #{add.itemId},
+            #{add.itemTitle},
+            #{add.reservePrice},
+            #{add.imageUrl},
+            #{add.orderStatus},
+            #{add.orderCreateTime},
+            #{add.sendStatus},
+            #{add.settlementBizType},
+            #{add.settlementBizTypeDesc},
+            #{add.sendTime},
+            #{add.recvTime},
+            #{add.sellerId},
+            #{add.promoterId},
+            #{add.promoterNickName},
+            #{add.activityId},
+            #{add.orderAmount},
+            #{add.payAmount},
+            #{add.regimentalPromotionRate},
+            #{add.shareRate},
+            #{add.baseAmount},
+            #{add.serviceAmount},
+            #{add.regimentalPromotionAmount},
+            #{add.totalRegimentalSettleAmount},
+            #{add.statDate},
+            #{add.statHour},
+            #{add.itemCommissionRate}
             )
         </foreach>
     </insert>
-    <insert id="cleanKuaiShouPromoterBindChannel" parameterType="java.lang.Long">
-        insert into miaogousi.promoter_bind_channel_date (promoter_id, promoter_name,promoter_url, user_id, user_name, stat_date,media_id)
-        select t1.promoter_id, t1.promoter_nick_name, t1.promoter_url,t1.user_id, t1.user_name, #{date},media_id
-        from miaogousi.kuaishou_promoter t1
-        left join miaogousi.sys_user_role t2
-        on t1.user_id = t2.user_id
-        left join miaogousi.sys_role t3
-        on t2.role_id = t3.role_id
-        where  1 = 1
-        and t1.media_id = '2'
-        and t3.role_key in ('bdManager', 'bd')
-        and date_format(t1.create_time, '%Y%m%d')  &lt; #{date}
-        group by t1.promoter_id
 
-    </insert>
-    <delete id="deletePromoterBindChannelByDate" parameterType="java.lang.Long">
-        delete from miaogousi.promoter_bind_channel_date where stat_date = #{date}
-    </delete>
+
+
+
+
+
+
     <select id="getCookie" resultType="com.alibaba.fastjson.JSONObject">
 
         select  id ,cookie  from miaogousi.kuaishou_supply_chain_cookie
 
     </select>
-    <select id="getDataList" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.Long">
-      select t.*, tt.rule_type
-      from (select *
-      from (select t1.relate_id                                 as 'relateId',
-                   (case
-                        when t2.rule_id is not null
-                            then t2.rule_id
-                        else 1
-                       end
-                       )                                        as 'ruleId',
-                   group_concat(t1.item_id)                     as 'itemIds',
-                   t1.promoter_id                               as 'promoterId',
-                   t1.promoter_name                             as 'promoterName',
-                   t1.item_create_id                            as 'itemCreateId',
-                   t1.item_create_name                          as 'itemCreateName',
-                   t1.promoter_create_id                        as 'promoterCreateId',
-                   t1.promoter_create_name                      as 'promoterCreateName',
-                   ifnull(sum(t1.order_num), 0)                 as 'orderNum',
-                   ifnull(sum(t1.valid_order_num), 0)           as 'validOrderNum',
-                   ifnull(sum(t1.yesterday_order_num), 0)       as 'yesterdayOrderNum',
-                   ifnull(sum(t1.yesterday_valid_order_num), 0) as 'yesterdayValidOrderNum',
-                   t1.stat_date                                 as 'statDate',
-                   round(t2.item_price / 100, 2)                as 'itemPrice'
-            from miaogousi.kuaishou_rule_order_data t1
-                     left join miaogousi.kuaishou_item_list t2 on t1.item_id = t2.item_id
-            where t1.stat_date = #{statDate}
-              and t1.relate_id is not null
-            group by t1.relate_id, t1.promoter_id) t
-      where t.itemPrice >= 6
-      order by t.validOrderNum desc) t
-         left join miaogousi.kuaishou_settlement_rules tt
-                   on t.ruleId = tt.id
-    </select>
-    <select id="getPromoterDataList" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.Long">
-select t1.rule_id                                   as 'ruleId',
-       t1.promoter_id                               as 'promoterId',
-       t2.promoter_name                             as 'promoterName',
-       ifnull(sum(t2.order_num), 0)                 as 'orderNum',
-       ifnull(sum(t2.valid_order_num), 0)           as 'validOrderNum',
-       ifnull(sum(t2.yesterday_order_num), 0)       as 'yesterdayOrderNum',
-       ifnull(sum(t2.yesterday_valid_order_num), 0) as 'yesterdayValidOrderNum',
-       t2.stat_date                                 as 'statDate',
-       3                                            as 'rule_type',
-       t3.item_price                                as 'itemPrice'
-
-from miaogousi.promoter_bind_rule t1
-         left join miaogousi.kuaishou_rule_order_data t2 on t1.promoter_id = t2.promoter_id
-         left join miaogousi.kuaishou_item_list t3 on t2.item_id = t3.item_id
-where 1 = 1
-  and t2.stat_date =  #{statDate}
-  and t3.item_price >= 600
-group by t1.promoter_id;
 
 
-    </select>
-    <select id="getSamplesData" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.String">
-      select  id,courier_number as 'courierNumber',company_code as 'companyCode' from miaogousi.kuaishou_item_collect_samples
-      where courier_number_time  &gt;=  str_to_date(CONCAT(date_format(#{startDate}, '%Y-%m-%d'), '00:00:01'), '%Y-%m-%d %H:%i:%s')
-      and collect_sample_status  = 4
-      and collect_sample_desc = '单号异常'
-    </select>
-    <select id="cleanBytedancePromoterBindChannel" parameterType="java.lang.Long">
-          insert into miaogousi.promoter_bind_channel_date (promoter_id, promoter_name,promoter_url, user_id, user_name, stat_date,media_id)
-        select t1.promoter_id, t1.promoter_nick_name, t1.promoter_url,t1.user_id, t1.user_name, #{date},media_id
-        from miaogousi.kuaishou_promoter t1
-        left join miaogousi.sys_user_role t2
-        on t1.user_id = t2.user_id
-        left join miaogousi.sys_role t3
-        on t2.role_id = t3.role_id
-        where  1 = 1
-        and t1.media_id = '1'
-        and t3.role_key in ('bdManager', 'bd')
-        and date_format(t1.create_time, '%Y%m%d')  &lt;= #{date}
-        group by t1.promoter_id
 
-    </select>
+
 
 </mapper>

+ 1 - 174
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/RocketSupplyChainMapper.xml

@@ -1,104 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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.batch.mapper.RocketSupplyChainMapper">
-
-    <insert id="replace">
-        replace into rocket.kuaishou_supply_chain(
-        id,
-        oid,
-        item_id,
-        item_title,
-        reserve_price,
-        image_url,
-        order_status,
-        order_create_time,
-        send_status,
-        settlement_biz_type,
-        settlement_biz_type_desc,
-        send_time,
-        recv_time,
-        seller_id,
-        promoter_id,
-        promoter_nick_name,
-        activity_id,
-        order_amount,
-        pay_amount,
-        regimental_promotion_rate,
-        share_rate,
-        base_amount,
-        service_amount,
-        regimental_promotion_amount,
-        total_regimental_settle_amount,
-        stat_date,
-        stat_hour,
-        item_commission_rate
-        )
-        values
-        <foreach collection="adds" item="add" separator=",">
-            (
-            #{add.id},
-            #{add.oid},
-            #{add.itemId},
-            #{add.itemTitle},
-            #{add.reservePrice},
-            #{add.imageUrl},
-            #{add.orderStatus},
-            #{add.orderCreateTime},
-            #{add.sendStatus},
-            #{add.settlementBizType},
-            #{add.settlementBizTypeDesc},
-            #{add.sendTime},
-            #{add.recvTime},
-            #{add.sellerId},
-            #{add.promoterId},
-            #{add.promoterNickName},
-            #{add.activityId},
-            #{add.orderAmount},
-            #{add.payAmount},
-            #{add.regimentalPromotionRate},
-            #{add.shareRate},
-            #{add.baseAmount},
-            #{add.serviceAmount},
-            #{add.regimentalPromotionAmount},
-            #{add.totalRegimentalSettleAmount},
-            #{add.statDate},
-            #{add.statHour},
-            #{add.itemCommissionRate}
-            )
-
-        </foreach>
-    </insert>
-    <insert id="replaceSettlement">
-        replace into rocket.kuaishou_supply_chain_settlement(
-        oid,
-        settlement_amount,
-        settlement_time
-
-        )
-        values
-        <foreach collection="adds" item="add" separator=",">
-            (
-            #{add.oid},
-            #{add.settlementAmount},
-            #{add.settlementTime}
-            )
-        </foreach>
-    </insert>
-    <insert id="cleanKuaiShouPromoterBindChannel" parameterType="java.lang.Long">
-        insert into rocket.promoter_bind_channel_date (promoter_id, promoter_name,promoter_url, user_id, user_name, stat_date,media_id)
-        select t1.promoter_id, t1.promoter_nick_name, t1.promoter_url,t1.user_id, t1.user_name, #{date},media_id
-        from rocket.kuaishou_promoter t1
-        left join rocket.sys_user_role t2
-        on t1.user_id = t2.user_id
-        left join rocket.sys_role t3
-        on t2.role_id = t3.role_id
-        where  1 = 1
-        and t1.media_id = '2'
-        and t3.role_key in ('bdManager', 'bd')
-        and date_format(t1.create_time, '%Y%m%d')  &lt; #{date}
-        group by t1.promoter_id
-
-    </insert>
     <insert id="replaceRuixuanSupplyChains">
         replace into ruixuan.kuaishou_supply_chain(
         id,
@@ -365,89 +267,14 @@
             )
         </foreach>
     </insert>
-    <delete id="deletePromoterBindChannelByDate" parameterType="java.lang.Long">
-        delete from rocket.promoter_bind_channel_date where stat_date = #{date}
-    </delete>
+
     <select id="getCookie" resultType="com.alibaba.fastjson.JSONObject">
 
         select  id ,cookie  from rocket.kuaishou_supply_chain_cookie
 
     </select>
-    <select id="getDataList" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.Long">
-      select t.*, tt.rule_type
-      from (select *
-      from (select t1.relate_id                                 as 'relateId',
-                   (case
-                        when t2.rule_id is not null
-                            then t2.rule_id
-                        else 1
-                       end
-                       )                                        as 'ruleId',
-                   group_concat(t1.item_id)                     as 'itemIds',
-                   t1.promoter_id                               as 'promoterId',
-                   t1.promoter_name                             as 'promoterName',
-                   t1.item_create_id                            as 'itemCreateId',
-                   t1.item_create_name                          as 'itemCreateName',
-                   t1.promoter_create_id                        as 'promoterCreateId',
-                   t1.promoter_create_name                      as 'promoterCreateName',
-                   ifnull(sum(t1.order_num), 0)                 as 'orderNum',
-                   ifnull(sum(t1.valid_order_num), 0)           as 'validOrderNum',
-                   ifnull(sum(t1.yesterday_order_num), 0)       as 'yesterdayOrderNum',
-                   ifnull(sum(t1.yesterday_valid_order_num), 0) as 'yesterdayValidOrderNum',
-                   t1.stat_date                                 as 'statDate',
-                   round(t2.item_price / 100, 2)                as 'itemPrice'
-            from rocket.kuaishou_rule_order_data t1
-                     left join rocket.kuaishou_item_list t2 on t1.item_id = t2.item_id
-            where t1.stat_date = #{statDate}
-              and t1.relate_id is not null
-            group by t1.relate_id, t1.promoter_id) t
-      where t.itemPrice >= 6
-      order by t.validOrderNum desc) t
-         left join rocket.kuaishou_settlement_rules tt
-                   on t.ruleId = tt.id
-    </select>
-    <select id="getPromoterDataList" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.Long">
-select t1.rule_id                                   as 'ruleId',
-       t1.promoter_id                               as 'promoterId',
-       t2.promoter_name                             as 'promoterName',
-       ifnull(sum(t2.order_num), 0)                 as 'orderNum',
-       ifnull(sum(t2.valid_order_num), 0)           as 'validOrderNum',
-       ifnull(sum(t2.yesterday_order_num), 0)       as 'yesterdayOrderNum',
-       ifnull(sum(t2.yesterday_valid_order_num), 0) as 'yesterdayValidOrderNum',
-       t2.stat_date                                 as 'statDate',
-       3                                            as 'rule_type',
-       t3.item_price                                as 'itemPrice'
 
-from rocket.promoter_bind_rule t1
-         left join rocket.kuaishou_rule_order_data t2 on t1.promoter_id = t2.promoter_id
-         left join rocket.kuaishou_item_list t3 on t2.item_id = t3.item_id
-where 1 = 1
-  and t2.stat_date =  #{statDate}
-  and t3.item_price >= 600
-group by t1.promoter_id;
 
 
-    </select>
-    <select id="getSamplesData" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.String">
-      select  id,courier_number as 'courierNumber',company_code as 'companyCode' from rocket.kuaishou_item_collect_samples
-      where courier_number_time  &gt;=  str_to_date(CONCAT(date_format(#{startDate}, '%Y-%m-%d'), '00:00:01'), '%Y-%m-%d %H:%i:%s')
-      and collect_sample_status  = 4
-      and collect_sample_desc = '单号异常'
-    </select>
-    <select id="cleanBytedancePromoterBindChannel" parameterType="java.lang.Long">
-          insert into rocket.promoter_bind_channel_date (promoter_id, promoter_name,promoter_url, user_id, user_name, stat_date,media_id)
-        select t1.promoter_id, t1.promoter_nick_name, t1.promoter_url,t1.user_id, t1.user_name, #{date},media_id
-        from rocket.kuaishou_promoter t1
-        left join rocket.sys_user_role t2
-        on t1.user_id = t2.user_id
-        left join rocket.sys_role t3
-        on t2.role_id = t3.role_id
-        where  1 = 1
-        and t1.media_id = '1'
-        and t3.role_key in ('bdManager', 'bd')
-        and date_format(t1.create_time, '%Y%m%d')  &lt;= #{date}
-        group by t1.promoter_id
-
-    </select>
 
 </mapper>

+ 1 - 106
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/YufuSupplyChainMapper.xml

@@ -3,37 +3,8 @@
 <mapper namespace="cn.com.ctop.kuaishou.modules.batch.mapper.YufuSupplyChainMapper">
 
 
-    <insert id="replaceSettlement">
-        replace into yufu.kuaishou_supply_chain_settlement(
-        oid,
-        settlement_amount,
-        settlement_time
 
-        )
-        values
-        <foreach collection="adds" item="add" separator=",">
-            (
-            #{add.oid},
-            #{add.settlementAmount},
-            #{add.settlementTime}
-            )
-        </foreach>
-    </insert>
-    <insert id="cleanKuaiShouPromoterBindChannel" parameterType="java.lang.Long">
-        insert into yufu.promoter_bind_channel_date (promoter_id, promoter_name,promoter_url, user_id, user_name, stat_date,media_id)
-        select t1.promoter_id, t1.promoter_nick_name, t1.promoter_url,t1.user_id, t1.user_name, #{date},media_id
-        from yufu.kuaishou_promoter t1
-        left join yufu.sys_user_role t2
-        on t1.user_id = t2.user_id
-        left join yufu.sys_role t3
-        on t2.role_id = t3.role_id
-        where  1 = 1
-        and t1.media_id = '2'
-        and t3.role_key in ('bdManager', 'bd')
-        and date_format(t1.create_time, '%Y%m%d')  &lt; #{date}
-        group by t1.promoter_id
 
-    </insert>
     <insert id="replaceRuixuanSupplyChains">
         replace into ruixuan.kuaishou_supply_chain(
         id,
@@ -300,91 +271,15 @@
             )
 
         </foreach>
-
     </insert>
-    <delete id="deletePromoterBindChannelByDate" parameterType="java.lang.Long">
-        delete from yufu.promoter_bind_channel_date where stat_date = #{date}
-    </delete>
+
     <select id="getCookie" resultType="com.alibaba.fastjson.JSONObject">
 
         select  id ,cookie  from yufu.kuaishou_supply_chain_cookie
 
     </select>
-    <select id="getDataList" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.Long">
-      select t.*, tt.rule_type
-      from (select *
-      from (select t1.relate_id                                 as 'relateId',
-                   (case
-                        when t2.rule_id is not null
-                            then t2.rule_id
-                        else 1
-                       end
-                       )                                        as 'ruleId',
-                   group_concat(t1.item_id)                     as 'itemIds',
-                   t1.promoter_id                               as 'promoterId',
-                   t1.promoter_name                             as 'promoterName',
-                   t1.item_create_id                            as 'itemCreateId',
-                   t1.item_create_name                          as 'itemCreateName',
-                   t1.promoter_create_id                        as 'promoterCreateId',
-                   t1.promoter_create_name                      as 'promoterCreateName',
-                   ifnull(sum(t1.order_num), 0)                 as 'orderNum',
-                   ifnull(sum(t1.valid_order_num), 0)           as 'validOrderNum',
-                   ifnull(sum(t1.yesterday_order_num), 0)       as 'yesterdayOrderNum',
-                   ifnull(sum(t1.yesterday_valid_order_num), 0) as 'yesterdayValidOrderNum',
-                   t1.stat_date                                 as 'statDate',
-                   round(t2.item_price / 100, 2)                as 'itemPrice'
-            from yufu.kuaishou_rule_order_data t1
-                     left join yufu.kuaishou_item_list t2 on t1.item_id = t2.item_id
-            where t1.stat_date = #{statDate}
-              and t1.relate_id is not null
-            group by t1.relate_id, t1.promoter_id) t
-      where t.itemPrice >= 6
-      order by t.validOrderNum desc) t
-         left join yufu.kuaishou_settlement_rules tt
-                   on t.ruleId = tt.id
-    </select>
-    <select id="getPromoterDataList" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.Long">
-select t1.rule_id                                   as 'ruleId',
-       t1.promoter_id                               as 'promoterId',
-       t2.promoter_name                             as 'promoterName',
-       ifnull(sum(t2.order_num), 0)                 as 'orderNum',
-       ifnull(sum(t2.valid_order_num), 0)           as 'validOrderNum',
-       ifnull(sum(t2.yesterday_order_num), 0)       as 'yesterdayOrderNum',
-       ifnull(sum(t2.yesterday_valid_order_num), 0) as 'yesterdayValidOrderNum',
-       t2.stat_date                                 as 'statDate',
-       3                                            as 'rule_type',
-       t3.item_price                                as 'itemPrice'
 
-from yufu.promoter_bind_rule t1
-         left join yufu.kuaishou_rule_order_data t2 on t1.promoter_id = t2.promoter_id
-         left join yufu.kuaishou_item_list t3 on t2.item_id = t3.item_id
-where 1 = 1
-  and t2.stat_date =  #{statDate}
-  and t3.item_price >= 600
-group by t1.promoter_id;
 
 
-    </select>
-    <select id="getSamplesData" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.String">
-      select  id,courier_number as 'courierNumber',company_code as 'companyCode' from yufu.kuaishou_item_collect_samples
-      where courier_number_time  &gt;=  str_to_date(CONCAT(date_format(#{startDate}, '%Y-%m-%d'), '00:00:01'), '%Y-%m-%d %H:%i:%s')
-      and collect_sample_status  = 4
-      and collect_sample_desc = '单号异常'
-    </select>
-    <select id="cleanBytedancePromoterBindChannel" parameterType="java.lang.Long">
-          insert into yufu.promoter_bind_channel_date (promoter_id, promoter_name,promoter_url, user_id, user_name, stat_date,media_id)
-        select t1.promoter_id, t1.promoter_nick_name, t1.promoter_url,t1.user_id, t1.user_name, #{date},media_id
-        from yufu.kuaishou_promoter t1
-        left join yufu.sys_user_role t2
-        on t1.user_id = t2.user_id
-        left join yufu.sys_role t3
-        on t2.role_id = t3.role_id
-        where  1 = 1
-        and t1.media_id = '1'
-        and t3.role_key in ('bdManager', 'bd')
-        and date_format(t1.create_time, '%Y%m%d')  &lt;= #{date}
-        group by t1.promoter_id
-
-    </select>
 
 </mapper>

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

@@ -19,7 +19,6 @@ public interface IKuaishouSupplyChainService extends IService<KuaishouSupplyChai
 
     List<JSONObject> getCookie();
 
-    void getSettlementData(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception;
 
     List<JSONObject> getDataList(Long statDate);
 

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

@@ -9,26 +9,13 @@ import java.util.Map;
 
 /**
  * 快手电商-供应链订单信息
+ *
  * @author jeecg-boot
  * 2022-12-01
  * @version V1.0
  */
 public interface IMgsSupplyChainService extends IService<KuaishouSupplyChain> {
-    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd, Map<Long,Long> itemMap) throws Exception;
+    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd, Map<Long, Long> itemMap) throws Exception;
 
     List<JSONObject> getCookie();
-
-    void getSettlementData(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception;
-
-    List<JSONObject> getDataList(Long statDate);
-
-    List<JSONObject> getPromoterDataList(Long statDate);
-
-    void deletePromoterBindChannelByDate(Long date);
-
-    void cleanKuaiShouPromoterBindChannel(Long date);
-
-    List<JSONObject> getSamplesData(String startDate);
-
-    void cleanBytedancePromoterBindChannel(Long date);
 }

+ 0 - 7
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/RocketSupplyChainService.java

@@ -15,17 +15,10 @@ public interface RocketSupplyChainService extends IService<KuaishouSupplyChain>
 
     List<JSONObject> getCookie();
 
-    void getSettlementData(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception;
 
-    List<JSONObject> getDataList(Long statDate);
 
-    List<JSONObject> getPromoterDataList(Long statDate);
 
-    void deletePromoterBindChannelByDate(Long date);
 
-    void cleanKuaiShouPromoterBindChannel(Long date);
 
-    List<JSONObject> getSamplesData(String startDate);
 
-    void cleanBytedancePromoterBindChannel(Long date);
 }

+ 0 - 13
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/YufuSupplyChainService.java

@@ -15,18 +15,5 @@ public interface YufuSupplyChainService extends IService<KuaishouSupplyChain> {
 
     List<JSONObject> getCookie();
 
-    void getSettlementData(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception;
-
-    List<JSONObject> getDataList(Long statDate);
-
-    List<JSONObject> getPromoterDataList(Long statDate);
-
-    void deletePromoterBindChannelByDate(Long date);
-
-    void cleanKuaiShouPromoterBindChannel(Long date);
-
-    List<JSONObject> getSamplesData(String startDate);
-
-    void cleanBytedancePromoterBindChannel(Long date);
 
 }

+ 0 - 57
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouSupplyChainServiceImpl.java

@@ -292,64 +292,7 @@ public class KuaishouSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyCh
         return supplyChainMapper.getCookie();
     }
 
-    @Override
-    public void getSettlementData(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception {
 
-        String getUrl = "https://cps.kwaixiaodian.com/distribute/pc/investment/bill/list";
-        Map<String, Object> params = new HashMap<>();
-        if (!Check.isNull(orderCreateTimeStart)) {
-            params.put("settlementTimeStart", orderCreateTimeStart);
-        }
-        if (!Check.isNull(orderCreateTimeEnd)) {
-            params.put("settlementTimeEnd", orderCreateTimeEnd);
-        }
-
-        params.put("limit", 5000);
-        params.put("offset", offset);
-        params.put("activityUserType", 1);
-
-        Map<String, String> headers = new HashMap<>();
-        headers.put("Cookie", cookie);
-
-        String resultStr = HttpUtils.KuaiShouttpGetRequest(getUrl, params, headers);
-        JSONObject result = JSONObject.parseObject(resultStr);
-        if (Check.isNull(result)) {
-            log.error("快分销数据返回为空");
-            return;
-        }
-        Integer code = result.getInteger("result");
-        if (code != 1) {
-            log.info("快分销数据返回异常:", resultStr);
-            sendMessageService.sendMessage("113dee46c7df464da78c07a985e92cd1", "快手供应链cookie失效,请及时更新。媒体返回信息:" + resultStr);
-            return;
-        }
-        JSONObject dataJson = result.getJSONObject("data");
-        if (Check.isNull(dataJson)) {
-            log.error("快分销数据返回为data数据为空");
-            return;
-        }
-        JSONArray list = dataJson.getJSONArray("list");
-        if (Check.isNull(list)) {
-            log.error("快分销数据返回为list数据为空");
-            return;
-        }
-        log.info("快分销当前数据条数:{}", list.size());
-        List<KuaishouSupplyChainSettlement> supplyChains = new ArrayList<>();
-        for (int i = 0; i < list.size(); i++) {
-            JSONObject jsonObject = list.getJSONObject(i);
-            KuaishouSupplyChainSettlement supplyChain = new KuaishouSupplyChainSettlement();
-            supplyChain.setOid(jsonObject.getLong("oid"));
-            supplyChain.setSettlementAmount(jsonObject.getLong("settlementAmount"));
-            supplyChain.setSettlementTime(jsonObject.getLong("settlementTime"));
-
-            supplyChains.add(supplyChain);
-        }
-        supplyChainMapper.replaceSettlement(supplyChains);
-        Thread.sleep(2000L);
-        if (list.size() >= 5000) {
-            getSettlementData(cookie, offset + 5000, orderCreateTimeStart, orderCreateTimeEnd);
-        }
-    }
 
     @Override
     public List<JSONObject> getDataList(Long statDate) {

+ 6 - 83
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/MgsSupplyChainServiceImpl.java

@@ -46,8 +46,7 @@ public class MgsSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyChainMa
     private MgsSupplyChainMapper mgsSupplyChainMapper;
     @Autowired
     private MongoTemplate mongoTemplate;
-    @Autowired
-    private RocketSupplyChainMapper rocketSupplyChainMapper;
+
 
     public static void main(String[] args) {
         System.err.println(DateUtils.tempToLongDateStr(1706112000000L));
@@ -163,19 +162,19 @@ public class MgsSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyChainMa
         }
         try {
             if (!Check.isNull(ruixuanSupplyChains)) {
-                rocketSupplyChainMapper.replaceRuixuanSupplyChains(ruixuanSupplyChains);
+                mgsSupplyChainMapper.replaceRuixuanSupplyChains(ruixuanSupplyChains);
             }
 
             if (!Check.isNull(mgsSupplyChains)) {
-                rocketSupplyChainMapper.replaceMgsSupplyChains(mgsSupplyChains);
+                mgsSupplyChainMapper.replaceMgsSupplyChains(mgsSupplyChains);
             }
 
             if (!Check.isNull(rocketSupplyChains)) {
-                rocketSupplyChainMapper.replaceRocketSupplyChains(rocketSupplyChains);
+                mgsSupplyChainMapper.replaceRocketSupplyChains(rocketSupplyChains);
             }
 
             if (!Check.isNull(yufuSupplyChains)) {
-                rocketSupplyChainMapper.replaceYufuSupplyChains(yufuSupplyChains);
+                mgsSupplyChainMapper.replaceYufuSupplyChains(yufuSupplyChains);
             }
 
 
@@ -194,94 +193,18 @@ public class MgsSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyChainMa
         return mgsSupplyChainMapper.getCookie();
     }
 
-    @Override
-    public void getSettlementData(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception {
 
-        String getUrl = "https://cps.kwaixiaodian.com/distribute/pc/investment/bill/list";
-        Map<String, Object> params = new HashMap<>();
-        if (!Check.isNull(orderCreateTimeStart)) {
-            params.put("settlementTimeStart", orderCreateTimeStart);
-        }
-        if (!Check.isNull(orderCreateTimeEnd)) {
-            params.put("settlementTimeEnd", orderCreateTimeEnd);
-        }
 
-        params.put("limit", 5000);
-        params.put("offset", offset);
-        params.put("activityUserType", 1);
 
-        Map<String, String> headers = new HashMap<>();
-        headers.put("Cookie", cookie);
 
-        String resultStr = HttpUtils.KuaiShouttpGetRequest(getUrl, params, headers);
-        JSONObject result = JSONObject.parseObject(resultStr);
-        if (Check.isNull(result)) {
-            log.error("mgs数据返回为空");
-            return;
-        }
-        Integer code = result.getInteger("result");
-        if (code != 1) {
-            log.info("mgs返回异常:", resultStr);
-            sendMessageService.sendMessage("113dee46c7df464da78c07a985e92cd1", "mgs供应链cookie失效,请及时更新。媒体返回信息:" + resultStr);
-            return;
-        }
-        JSONObject dataJson = result.getJSONObject("data");
-        if (Check.isNull(dataJson)) {
-            log.error("快分销数据返回为data数据为空");
-            return;
-        }
-        JSONArray list = dataJson.getJSONArray("list");
-        if (Check.isNull(list)) {
-            log.error("快分销数据返回为list数据为空");
-            return;
-        }
-        log.info("快分销当前数据条数:{}", list.size());
-        List<KuaishouSupplyChainSettlement> supplyChains = new ArrayList<>();
-        for (int i = 0; i < list.size(); i++) {
-            JSONObject jsonObject = list.getJSONObject(i);
-            KuaishouSupplyChainSettlement supplyChain = new KuaishouSupplyChainSettlement();
-            supplyChain.setOid(jsonObject.getLong("oid"));
-            supplyChain.setSettlementAmount(jsonObject.getLong("settlementAmount"));
-            supplyChain.setSettlementTime(jsonObject.getLong("settlementTime"));
 
-            supplyChains.add(supplyChain);
-        }
-        mgsSupplyChainMapper.replaceSettlement(supplyChains);
-        Thread.sleep(2000L);
-        if (list.size() >= 5000) {
-            getSettlementData(cookie, offset + 5000, orderCreateTimeStart, orderCreateTimeEnd);
-        }
-    }
 
-    @Override
-    public List<JSONObject> getDataList(Long statDate) {
-        return mgsSupplyChainMapper.getDataList(statDate);
-    }
 
-    @Override
-    public List<JSONObject> getPromoterDataList(Long statDate) {
-        return mgsSupplyChainMapper.getPromoterDataList(statDate);
-    }
 
-    @Override
-    public void deletePromoterBindChannelByDate(Long date) {
-        mgsSupplyChainMapper.deletePromoterBindChannelByDate(date);
-    }
 
-    @Override
-    public void cleanKuaiShouPromoterBindChannel(Long date) {
-        mgsSupplyChainMapper.cleanKuaiShouPromoterBindChannel(date);
-    }
 
-    @Override
-    public List<JSONObject> getSamplesData(String startDate) {
-        return mgsSupplyChainMapper.getSamplesData(startDate);
-    }
 
-    @Override
-    public void cleanBytedancePromoterBindChannel(Long date) {
-        mgsSupplyChainMapper.cleanBytedancePromoterBindChannel(date);
-    }
+
 
     public static String filterSupplement(String content) {
         StringBuilder sb = new StringBuilder();

+ 0 - 89
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/RocketSupplyChainServiceImpl.java

@@ -190,95 +190,6 @@ public class RocketSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyChai
         return rocketSupplyChainMapper.getCookie();
     }
 
-    @Override
-    public void getSettlementData(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception {
-
-        String getUrl = "https://cps.kwaixiaodian.com/distribute/pc/investment/bill/list";
-        Map<String, Object> params = new HashMap<>();
-        if (!Check.isNull(orderCreateTimeStart)) {
-            params.put("settlementTimeStart", orderCreateTimeStart);
-        }
-        if (!Check.isNull(orderCreateTimeEnd)) {
-            params.put("settlementTimeEnd", orderCreateTimeEnd);
-        }
-
-        params.put("limit", 5000);
-        params.put("offset", offset);
-        params.put("activityUserType", 1);
-
-        Map<String, String> headers = new HashMap<>();
-        headers.put("Cookie", cookie);
-
-        String resultStr = HttpUtils.KuaiShouttpGetRequest(getUrl, params, headers);
-        JSONObject result = JSONObject.parseObject(resultStr);
-        if (Check.isNull(result)) {
-            log.error("rocket数据返回为空");
-            return;
-        }
-        Integer code = result.getInteger("result");
-        if (code != 1) {
-            log.info("rocket返回异常:", resultStr);
-            sendMessageService.sendMessage("113dee46c7df464da78c07a985e92cd1", "rocket供应链cookie失效,请及时更新。媒体返回信息:" + resultStr);
-            return;
-        }
-        JSONObject dataJson = result.getJSONObject("data");
-        if (Check.isNull(dataJson)) {
-            log.error("快分销数据返回为data数据为空");
-            return;
-        }
-        JSONArray list = dataJson.getJSONArray("list");
-        if (Check.isNull(list)) {
-            log.error("快分销数据返回为list数据为空");
-            return;
-        }
-        log.info("快分销当前数据条数:{}", list.size());
-        List<KuaishouSupplyChainSettlement> supplyChains = new ArrayList<>();
-        for (int i = 0; i < list.size(); i++) {
-            JSONObject jsonObject = list.getJSONObject(i);
-            KuaishouSupplyChainSettlement supplyChain = new KuaishouSupplyChainSettlement();
-            supplyChain.setOid(jsonObject.getLong("oid"));
-            supplyChain.setSettlementAmount(jsonObject.getLong("settlementAmount"));
-            supplyChain.setSettlementTime(jsonObject.getLong("settlementTime"));
-
-            supplyChains.add(supplyChain);
-        }
-        rocketSupplyChainMapper.replaceSettlement(supplyChains);
-        Thread.sleep(2000L);
-        if (list.size() >= 5000) {
-            getSettlementData(cookie, offset + 5000, orderCreateTimeStart, orderCreateTimeEnd);
-        }
-    }
-
-    @Override
-    public List<JSONObject> getDataList(Long statDate) {
-        return rocketSupplyChainMapper.getDataList(statDate);
-    }
-
-    @Override
-    public List<JSONObject> getPromoterDataList(Long statDate) {
-        return rocketSupplyChainMapper.getPromoterDataList(statDate);
-    }
-
-    @Override
-    public void deletePromoterBindChannelByDate(Long date) {
-        rocketSupplyChainMapper.deletePromoterBindChannelByDate(date);
-    }
-
-    @Override
-    public void cleanKuaiShouPromoterBindChannel(Long date) {
-        rocketSupplyChainMapper.cleanKuaiShouPromoterBindChannel(date);
-    }
-
-    @Override
-    public List<JSONObject> getSamplesData(String startDate) {
-        return rocketSupplyChainMapper.getSamplesData(startDate);
-    }
-
-    @Override
-    public void cleanBytedancePromoterBindChannel(Long date) {
-        rocketSupplyChainMapper.cleanBytedancePromoterBindChannel(date);
-    }
-
     public static String filterSupplement(String content) {
         StringBuilder sb = new StringBuilder();
         for (char ch : content.toCharArray()) {

+ 0 - 95
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/YufuSupplyChainServiceImpl.java

@@ -5,12 +5,8 @@ import cn.com.ctop.common.module.service.ISendMessageService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.HttpUtils;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouSupplyChain;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouSupplyChainSettlement;
 import cn.com.ctop.kuaishou.modules.batch.entity.vo.ItemCheck;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaishouSupplyChainMapper;
-import cn.com.ctop.kuaishou.modules.batch.mapper.RocketSupplyChainMapper;
 import cn.com.ctop.kuaishou.modules.batch.mapper.YufuSupplyChainMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.RocketSupplyChainService;
 import cn.com.ctop.kuaishou.modules.batch.service.YufuSupplyChainService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -174,12 +170,9 @@ public class YufuSupplyChainServiceImpl extends ServiceImpl<YufuSupplyChainMappe
             if (!Check.isNull(rocketSupplyChains)) {
                 yufuSupplyChainMapper.replaceRocketSupplyChains(rocketSupplyChains);
             }
-
-
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         if (list.size() >= 100) {
             getOrderList(cookie, offset + 100, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
         }
@@ -191,94 +184,6 @@ public class YufuSupplyChainServiceImpl extends ServiceImpl<YufuSupplyChainMappe
         return yufuSupplyChainMapper.getCookie();
     }
 
-    @Override
-    public void getSettlementData(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception {
-
-        String getUrl = "https://cps.kwaixiaodian.com/distribute/pc/investment/bill/list";
-        Map<String, Object> params = new HashMap<>();
-        if (!Check.isNull(orderCreateTimeStart)) {
-            params.put("settlementTimeStart", orderCreateTimeStart);
-        }
-        if (!Check.isNull(orderCreateTimeEnd)) {
-            params.put("settlementTimeEnd", orderCreateTimeEnd);
-        }
-
-        params.put("limit", 5000);
-        params.put("offset", offset);
-        params.put("activityUserType", 1);
-
-        Map<String, String> headers = new HashMap<>();
-        headers.put("Cookie", cookie);
-
-        String resultStr = HttpUtils.KuaiShouttpGetRequest(getUrl, params, headers);
-        JSONObject result = JSONObject.parseObject(resultStr);
-        if (Check.isNull(result)) {
-            log.error("rocket数据返回为空");
-            return;
-        }
-        Integer code = result.getInteger("result");
-        if (code != 1) {
-            log.info("rocket返回异常:", resultStr);
-            sendMessageService.sendMessage("113dee46c7df464da78c07a985e92cd1", "rocket供应链cookie失效,请及时更新。媒体返回信息:" + resultStr);
-            return;
-        }
-        JSONObject dataJson = result.getJSONObject("data");
-        if (Check.isNull(dataJson)) {
-            log.error("快分销数据返回为data数据为空");
-            return;
-        }
-        JSONArray list = dataJson.getJSONArray("list");
-        if (Check.isNull(list)) {
-            log.error("快分销数据返回为list数据为空");
-            return;
-        }
-        log.info("快分销当前数据条数:{}", list.size());
-        List<KuaishouSupplyChainSettlement> supplyChains = new ArrayList<>();
-        for (int i = 0; i < list.size(); i++) {
-            JSONObject jsonObject = list.getJSONObject(i);
-            KuaishouSupplyChainSettlement supplyChain = new KuaishouSupplyChainSettlement();
-            supplyChain.setOid(jsonObject.getLong("oid"));
-            supplyChain.setSettlementAmount(jsonObject.getLong("settlementAmount"));
-            supplyChain.setSettlementTime(jsonObject.getLong("settlementTime"));
-
-            supplyChains.add(supplyChain);
-        }
-        yufuSupplyChainMapper.replaceSettlement(supplyChains);
-        Thread.sleep(2000L);
-        if (list.size() >= 5000) {
-            getSettlementData(cookie, offset + 5000, orderCreateTimeStart, orderCreateTimeEnd);
-        }
-    }
-
-    @Override
-    public List<JSONObject> getDataList(Long statDate) {
-        return yufuSupplyChainMapper.getDataList(statDate);
-    }
-
-    @Override
-    public List<JSONObject> getPromoterDataList(Long statDate) {
-        return yufuSupplyChainMapper.getPromoterDataList(statDate);
-    }
-
-    @Override
-    public void deletePromoterBindChannelByDate(Long date) {
-        yufuSupplyChainMapper.deletePromoterBindChannelByDate(date);
-    }
-
-    @Override
-    public void cleanKuaiShouPromoterBindChannel(Long date) {
-        yufuSupplyChainMapper.cleanKuaiShouPromoterBindChannel(date);
-    }
-
-    @Override
-    public List<JSONObject> getSamplesData(String startDate) {
-        return yufuSupplyChainMapper.getSamplesData(startDate);
-    }
-
-    @Override
-    public void cleanBytedancePromoterBindChannel(Long date) {
-        yufuSupplyChainMapper.cleanBytedancePromoterBindChannel(date);
-    }
 
     public static String filterSupplement(String content) {
         StringBuilder sb = new StringBuilder();