Selaa lähdekoodia

妙构思严选

yumeng 2 vuotta sitten
vanhempi
commit
1bed8c5b3b

+ 13 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java

@@ -139,8 +139,8 @@ public class TestController {
 //        Map<Long, Long> itemMap = activityItemListService.getItemMap();
 //        Map<Long, Long> itemMap = activityItemListService.getItemMap();
 //        System.err.println(itemMap);
 //        System.err.println(itemMap);
 
 
-        String cookie = ikuaishouSupplyChainService.getCookie();
-        if (Check.isNull(cookie)) {
+        List<JSONObject> cookies = ikuaishouSupplyChainService.getCookie();
+        if (Check.isNull(cookies)) {
             log.error("cookie数据为空");
             log.error("cookie数据为空");
             return;
             return;
         }
         }
@@ -163,7 +163,11 @@ public class TestController {
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     Long orderCreateTimeStart = sdf.parse(start).getTime();
                     Long orderCreateTimeStart = sdf.parse(start).getTime();
                     Long orderCreateTimeEnd = sdf.parse(end).getTime();
                     Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+                    for (int p = 0; p < cookies.size(); p++) {
+                        JSONObject cookieJson = cookies.get(p);
+                        String cookie = cookieJson.getString("cookie");
+                        ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+                    }
 
 
                 }
                 }
             }
             }
@@ -174,7 +178,7 @@ public class TestController {
     @GetMapping(value = "/getSettlementData")
     @GetMapping(value = "/getSettlementData")
     public void getsettlementData(String startDay, String endDay) throws Exception {
     public void getsettlementData(String startDay, String endDay) throws Exception {
         List<String> days = DateUtils.getDays(startDay, endDay);
         List<String> days = DateUtils.getDays(startDay, endDay);
-        String cookie = ikuaishouSupplyChainService.getCookie();
+        List<JSONObject> cookies = ikuaishouSupplyChainService.getCookie();
         JSONArray hourList = KuaishouHourEnum.getHourList();
         JSONArray hourList = KuaishouHourEnum.getHourList();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
         for (int z = 0; z < days.size(); z++) {
         for (int z = 0; z < days.size(); z++) {
@@ -192,8 +196,11 @@ public class TestController {
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     Long orderCreateTimeStart = sdf.parse(start).getTime();
                     Long orderCreateTimeStart = sdf.parse(start).getTime();
                     Long orderCreateTimeEnd = sdf.parse(end).getTime();
                     Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                    ikuaishouSupplyChainService.getSettlementData(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
-
+                    for (int p = 0; p < cookies.size(); p++) {
+                        JSONObject cookieJson = cookies.get(p);
+                        String cookie = cookieJson.getString("cookie");
+                        ikuaishouSupplyChainService.getSettlementData(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    }
                 }
                 }
             }
             }
 
 

+ 73 - 45
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouOrderLIstGetJob.java

@@ -14,11 +14,9 @@ import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
-import javax.print.DocFlavor;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
+
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -40,28 +38,27 @@ public class KuaishouOrderLIstGetJob {
     @XxlJob("getActivityItemList")
     @XxlJob("getActivityItemList")
     public void getActivityItemList() throws Exception {
     public void getActivityItemList() throws Exception {
         log.info("-------------------------快分销招商活动商品数据开始--------------------------");
         log.info("-------------------------快分销招商活动商品数据开始--------------------------");
-        String cookie = ikuaishouSupplyChainService.getCookie();
-        if (Check.isNull(cookie)) {
+        List<JSONObject> cookies = ikuaishouSupplyChainService.getCookie();
+        if (Check.isNull(cookies)) {
             log.error("cookie数据为空");
             log.error("cookie数据为空");
             return;
             return;
         }
         }
         Map<Long, Integer> itemMap = activityInfoService.getItemMap();
         Map<Long, Integer> itemMap = activityInfoService.getItemMap();
-
-        List<JSONObject> activityIdList = activityInfoService.getActivityIdList();
-        if (!Check.isNull(activityIdList)) {
-            for (int i = 0; i < activityIdList.size(); i++) {
-                JSONObject jsonObject = activityIdList.get(i);
-                Long activityId = jsonObject.getLong("activityId");
-                Integer activityStatus = jsonObject.getInteger("activityStatus");
-
-                activityItemListService.getActivityItemList(cookie, 0, activityId,activityStatus,itemMap);
-                Thread.sleep(1000);
+        for (int j = 0; j < cookies.size(); j++) {
+            JSONObject cookieJson = cookies.get(j);
+            Long id = cookieJson.getLong("id");
+            String cookie = cookieJson.getString("cookie");
+            List<JSONObject> activityIdList = activityInfoService.getActivityIdList(id);
+            if (!Check.isNull(activityIdList)) {
+                for (int i = 0; i < activityIdList.size(); i++) {
+                    JSONObject jsonObject = activityIdList.get(i);
+                    Long activityId = jsonObject.getLong("activityId");
+                    Integer activityStatus = jsonObject.getInteger("activityStatus");
+                    activityItemListService.getActivityItemList(cookie, 0, activityId, activityStatus, itemMap);
+                    Thread.sleep(1000);
+                }
             }
             }
-
-
         }
         }
-
-
     }
     }
 
 
 
 
@@ -71,14 +68,17 @@ public class KuaishouOrderLIstGetJob {
     @XxlJob("getActivityInfo")
     @XxlJob("getActivityInfo")
     public void getActivityInfo() throws Exception {
     public void getActivityInfo() throws Exception {
         log.info("-------------------------快分销招商活动数据开始--------------------------");
         log.info("-------------------------快分销招商活动数据开始--------------------------");
-        String cookie = ikuaishouSupplyChainService.getCookie();
-        if (Check.isNull(cookie)) {
+        List<JSONObject> cookies = ikuaishouSupplyChainService.getCookie();
+        if (Check.isNull(cookies)) {
             log.error("cookie数据为空");
             log.error("cookie数据为空");
             return;
             return;
         }
         }
-        activityInfoService.getActivityInfo(cookie, 0);
-
-
+        for (int i = 0; i < cookies.size(); i++) {
+            JSONObject cookieJson = cookies.get(i);
+            Long id = cookieJson.getLong("id");
+            String cookie = cookieJson.getString("cookie");
+            activityInfoService.getActivityInfo(id, cookie, 0);
+        }
     }
     }
 
 
 
 
@@ -93,7 +93,14 @@ public class KuaishouOrderLIstGetJob {
         String firstDay = monthStartAndEnd.get("firstDay");
         String firstDay = monthStartAndEnd.get("firstDay");
         String lastDay = monthStartAndEnd.get("lastDay");
         String lastDay = monthStartAndEnd.get("lastDay");
         List<String> days = DateUtils.getDays(firstDay, lastDay);
         List<String> days = DateUtils.getDays(firstDay, lastDay);
-        String cookie = ikuaishouSupplyChainService.getCookie();
+
+        List<JSONObject> cookies = ikuaishouSupplyChainService.getCookie();
+        if (Check.isNull(cookies)) {
+            log.error("cookie数据为空");
+            return;
+        }
+
+
         JSONArray hourList = KuaishouHourEnum.getHourList();
         JSONArray hourList = KuaishouHourEnum.getHourList();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
         Map<Long, Long> itemMap = activityItemListService.getItemMap();
         Map<Long, Long> itemMap = activityItemListService.getItemMap();
@@ -112,8 +119,11 @@ public class KuaishouOrderLIstGetJob {
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     Long orderCreateTimeStart = sdf.parse(start).getTime();
                     Long orderCreateTimeStart = sdf.parse(start).getTime();
                     Long orderCreateTimeEnd = sdf.parse(end).getTime();
                     Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
-
+                    for (int p = 0; p < cookies.size(); p++) {
+                        JSONObject cookieJson = cookies.get(p);
+                        String cookie = cookieJson.getString("cookie");
+                        ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+                    }
                 }
                 }
             }
             }
 
 
@@ -127,8 +137,8 @@ public class KuaishouOrderLIstGetJob {
     @XxlJob("nowMonthyOrderGet")
     @XxlJob("nowMonthyOrderGet")
     public void nowMonthyOrderGet() throws Exception {
     public void nowMonthyOrderGet() throws Exception {
         log.info("-------------------------获取快分销订单当前月数据开始数据开始--------------------------");
         log.info("-------------------------获取快分销订单当前月数据开始数据开始--------------------------");
-        String cookie = ikuaishouSupplyChainService.getCookie();
-        if (Check.isNull(cookie)) {
+        List<JSONObject> cookies = ikuaishouSupplyChainService.getCookie();
+        if (Check.isNull(cookies)) {
             log.error("cookie数据为空");
             log.error("cookie数据为空");
             return;
             return;
         }
         }
@@ -154,8 +164,11 @@ public class KuaishouOrderLIstGetJob {
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     Long orderCreateTimeStart = sdf.parse(start).getTime();
                     Long orderCreateTimeStart = sdf.parse(start).getTime();
                     Long orderCreateTimeEnd = sdf.parse(end).getTime();
                     Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
-
+                    for (int p = 0; p < cookies.size(); p++) {
+                        JSONObject cookieJson = cookies.get(p);
+                        String cookie = cookieJson.getString("cookie");
+                        ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+                    }
                 }
                 }
             }
             }
         }
         }
@@ -170,8 +183,8 @@ public class KuaishouOrderLIstGetJob {
     @XxlJob("yesterdayOrderGet")
     @XxlJob("yesterdayOrderGet")
     public void yesterdayOrderGet() throws Exception {
     public void yesterdayOrderGet() throws Exception {
         log.info("-------------------------获取快分销订单昨日数据开始数据开始--------------------------");
         log.info("-------------------------获取快分销订单昨日数据开始数据开始--------------------------");
-        String cookie = ikuaishouSupplyChainService.getCookie();
-        if (Check.isNull(cookie)) {
+        List<JSONObject> cookies = ikuaishouSupplyChainService.getCookie();
+        if (Check.isNull(cookies)) {
             log.error("cookie数据为空");
             log.error("cookie数据为空");
             return;
             return;
         }
         }
@@ -193,8 +206,11 @@ public class KuaishouOrderLIstGetJob {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 Long orderCreateTimeStart = sdf.parse(start).getTime();
                 Long orderCreateTimeStart = sdf.parse(start).getTime();
                 Long orderCreateTimeEnd = sdf.parse(end).getTime();
                 Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
-
+                for (int p = 0; p < cookies.size(); p++) {
+                    JSONObject cookieJson = cookies.get(p);
+                    String cookie = cookieJson.getString("cookie");
+                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+                }
             }
             }
         }
         }
     }
     }
@@ -206,13 +222,12 @@ public class KuaishouOrderLIstGetJob {
     @XxlJob("beforeYesterdayOrderGet")
     @XxlJob("beforeYesterdayOrderGet")
     public void beforeYesterdayOrderGet() throws Exception {
     public void beforeYesterdayOrderGet() throws Exception {
         log.info("-------------------------获取快分销订单前日数据开始数据开始--------------------------");
         log.info("-------------------------获取快分销订单前日数据开始数据开始--------------------------");
-        String cookie = ikuaishouSupplyChainService.getCookie();
-        if (Check.isNull(cookie)) {
+        List<JSONObject> cookies = ikuaishouSupplyChainService.getCookie();
+        if (Check.isNull(cookies)) {
             log.error("cookie数据为空");
             log.error("cookie数据为空");
             return;
             return;
         }
         }
         String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
         String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        //  String startDateate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
         String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
         String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
         JSONArray hourList = KuaishouHourEnum.getHourList();
         JSONArray hourList = KuaishouHourEnum.getHourList();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
@@ -230,7 +245,11 @@ public class KuaishouOrderLIstGetJob {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 Long orderCreateTimeStart = sdf.parse(start).getTime();
                 Long orderCreateTimeStart = sdf.parse(start).getTime();
                 Long orderCreateTimeEnd = sdf.parse(end).getTime();
                 Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+                for (int p = 0; p < cookies.size(); p++) {
+                    JSONObject cookieJson = cookies.get(p);
+                    String cookie = cookieJson.getString("cookie");
+                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+                }
 
 
             }
             }
         }
         }
@@ -243,8 +262,8 @@ public class KuaishouOrderLIstGetJob {
     @XxlJob("nowHourOrderGet")
     @XxlJob("nowHourOrderGet")
     public void nowHourOrderGet() throws Exception {
     public void nowHourOrderGet() throws Exception {
         log.info("-------------------------获取快分销订单当天当小时数据开始--------------------------");
         log.info("-------------------------获取快分销订单当天当小时数据开始--------------------------");
-        String cookie = ikuaishouSupplyChainService.getCookie();
-        if (Check.isNull(cookie)) {
+        List<JSONObject> cookies = ikuaishouSupplyChainService.getCookie();
+        if (Check.isNull(cookies)) {
             log.error("cookie数据为空");
             log.error("cookie数据为空");
             return;
             return;
         }
         }
@@ -263,7 +282,12 @@ public class KuaishouOrderLIstGetJob {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Long orderCreateTimeStart = sdf.parse(start).getTime();
             Long orderCreateTimeStart = sdf.parse(start).getTime();
             Long orderCreateTimeEnd = sdf.parse(end).getTime();
             Long orderCreateTimeEnd = sdf.parse(end).getTime();
-            ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+            for (int p = 0; p < cookies.size(); p++) {
+                JSONObject cookieJson = cookies.get(p);
+                String cookie = cookieJson.getString("cookie");
+                ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+            }
+
         }
         }
     }
     }
 
 
@@ -277,8 +301,8 @@ public class KuaishouOrderLIstGetJob {
     @XxlJob("frontHourOrderGet")
     @XxlJob("frontHourOrderGet")
     public void frontHourOrderGet() throws Exception {
     public void frontHourOrderGet() throws Exception {
         log.info("-------------------------获取快分销订单当天数据开始--------------------------");
         log.info("-------------------------获取快分销订单当天数据开始--------------------------");
-        String cookie = ikuaishouSupplyChainService.getCookie();
-        if (Check.isNull(cookie)) {
+        List<JSONObject> cookies = ikuaishouSupplyChainService.getCookie();
+        if (Check.isNull(cookies)) {
             log.error("cookie数据为空");
             log.error("cookie数据为空");
             return;
             return;
         }
         }
@@ -299,7 +323,11 @@ public class KuaishouOrderLIstGetJob {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 Long orderCreateTimeStart = sdf.parse(start).getTime();
                 Long orderCreateTimeStart = sdf.parse(start).getTime();
                 Long orderCreateTimeEnd = sdf.parse(end).getTime();
                 Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+                for (int p = 0; p < cookies.size(); p++) {
+                    JSONObject cookieJson = cookies.get(p);
+                    String cookie = cookieJson.getString("cookie");
+                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+                }
             }
             }
         }
         }
 
 

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

@@ -36,6 +36,7 @@ public class KuaiShouActivityInfo {
     @Excel(name = "活动ID", width = 15)
     @Excel(name = "活动ID", width = 15)
     @ApiModelProperty(value = "活动ID")
     @ApiModelProperty(value = "活动ID")
     private Long activityId;
     private Long activityId;
+    private Long regimentalId;
     /**
     /**
      * 活动标题
      * 活动标题
      */
      */

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

@@ -18,7 +18,7 @@ public interface KuaiShouActivityInfoMapper extends BaseMapper<KuaiShouActivityI
 
 
     void replace(@Param(value = "adds") List<KuaiShouActivityInfo> activityInfoList);
     void replace(@Param(value = "adds") List<KuaiShouActivityInfo> activityInfoList);
 
 
-    List<JSONObject> getActivityIdList();
+    List<JSONObject> getActivityIdList(Long id );
 
 
     List<JSONObject> itemList();
     List<JSONObject> itemList();
 }
 }

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

@@ -3,6 +3,7 @@ package cn.com.ctop.kuaishou.modules.batch.mapper;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouSupplyChain;
 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.KuaishouSupplyChainSettlement;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -18,7 +19,7 @@ public interface KuaishouSupplyChainMapper extends BaseMapper<KuaishouSupplyChai
 
 
     void replace(@Param(value = "adds") List<KuaishouSupplyChain> supplyChains);
     void replace(@Param(value = "adds") List<KuaishouSupplyChain> supplyChains);
 
 
-    String getCookie();
+    List<JSONObject>  getCookie();
 
 
     void replaceSettlement(@Param(value = "adds") List<KuaishouSupplyChainSettlement> supplyChains);
     void replaceSettlement(@Param(value = "adds") List<KuaishouSupplyChainSettlement> supplyChains);
 }
 }

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

@@ -5,6 +5,7 @@
     <insert id="replace">
     <insert id="replace">
         replace into ruixuan.kuaishou_activity_info(
         replace into ruixuan.kuaishou_activity_info(
         activity_id,
         activity_id,
+        regimental_id
         activity_title,
         activity_title,
         activity_type,
         activity_type,
         activity_begin_time,
         activity_begin_time,
@@ -18,6 +19,7 @@
         <foreach collection="adds" item="add" separator=",">
         <foreach collection="adds" item="add" separator=",">
             (
             (
             #{add.activityId},
             #{add.activityId},
+            #{add.regimentalId},
             #{add.activityTitle},
             #{add.activityTitle},
             #{add.activityType},
             #{add.activityType},
             #{add.activityBeginTime},
             #{add.activityBeginTime},
@@ -30,9 +32,12 @@
         </foreach>
         </foreach>
     </insert>
     </insert>
     <select id="getActivityIdList" resultType="com.alibaba.fastjson.JSONObject">
     <select id="getActivityIdList" resultType="com.alibaba.fastjson.JSONObject">
-        select activity_id as 'activityId',
+        select
+        regimental_id as  'regimentalId',
+        activity_id as 'activityId',
         activity_status as 'activityStatus'
         activity_status as 'activityStatus'
         from  ruixuan.kuaishou_activity_info
         from  ruixuan.kuaishou_activity_info
+        where regimental_id = #{id}
     </select>
     </select>
     <select id="itemList" resultType="com.alibaba.fastjson.JSONObject">
     <select id="itemList" resultType="com.alibaba.fastjson.JSONObject">
         select  item_id as 'itemId',activity_item_status as 'activityItemStatus'  from ruixuan.kuaishou_item_list
         select  item_id as 'itemId',activity_item_status as 'activityItemStatus'  from ruixuan.kuaishou_item_list

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

@@ -81,7 +81,10 @@
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
-    <select id="getCookie" resultType="java.lang.String">
-        select  cookie  from ruixuan.kuaishou_supply_chain_cookie limit 1
+    <select id="getCookie" resultType="com.alibaba.fastjson.JSONObject">
+
+        select  id ,cookie  from ruixuan.kuaishou_supply_chain_cookie
+
     </select>
     </select>
+
 </mapper>
 </mapper>

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

@@ -17,9 +17,9 @@ import java.util.Map;
  */
  */
 public interface IKuaiShouActivityInfoService extends IService<KuaiShouActivityInfo> {
 public interface IKuaiShouActivityInfoService extends IService<KuaiShouActivityInfo> {
 
 
-    void getActivityInfo(String cookie, Integer offset) throws Exception;
+    void getActivityInfo(Long regimentalId, String cookie, Integer offset) throws Exception;
 
 
-    List<JSONObject> getActivityIdList();
+    List<JSONObject> getActivityIdList(Long id);
 
 
     Map<Long, Integer> getItemMap();
     Map<Long, Integer> getItemMap();
 }
 }

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

@@ -1,8 +1,10 @@
 package cn.com.ctop.kuaishou.modules.batch.service;
 package cn.com.ctop.kuaishou.modules.batch.service;
 
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouSupplyChain;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouSupplyChain;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 /**
 /**
@@ -14,7 +16,7 @@ import java.util.Map;
 public interface IKuaishouSupplyChainService extends IService<KuaishouSupplyChain> {
 public interface IKuaishouSupplyChainService 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;
 
 
-    String getCookie();
+    List<JSONObject> getCookie();
 
 
     void getSettlementData(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception;
     void getSettlementData(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception;
 }
 }

+ 5 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouActivityInfoServiceImpl.java

@@ -39,7 +39,7 @@ public class KuaiShouActivityInfoServiceImpl extends ServiceImpl<KuaiShouActivit
     private KuaiShouActivityInfoMapper activityInfoMapper;
     private KuaiShouActivityInfoMapper activityInfoMapper;
 
 
     @Override
     @Override
-    public void getActivityInfo(String cookie, Integer offset) throws Exception {
+    public void getActivityInfo(Long regimentalId,String cookie, Integer offset) throws Exception {
         Map<String, Object> params = new HashMap<>();
         Map<String, Object> params = new HashMap<>();
         params.put("limit", 1000);
         params.put("limit", 1000);
         params.put("offset", offset);
         params.put("offset", offset);
@@ -70,6 +70,7 @@ public class KuaiShouActivityInfoServiceImpl extends ServiceImpl<KuaiShouActivit
             JSONObject jsonObject = dataArray.getJSONObject(i);
             JSONObject jsonObject = dataArray.getJSONObject(i);
             KuaiShouActivityInfo activityInfo = new KuaiShouActivityInfo();
             KuaiShouActivityInfo activityInfo = new KuaiShouActivityInfo();
             activityInfo.setActivityId(jsonObject.getLong("activityId"));
             activityInfo.setActivityId(jsonObject.getLong("activityId"));
+            activityInfo.setRegimentalId(regimentalId);
             activityInfo.setActivityTitle(jsonObject.getString("activityTitle"));
             activityInfo.setActivityTitle(jsonObject.getString("activityTitle"));
             activityInfo.setActivityType(jsonObject.getInteger("activityType"));
             activityInfo.setActivityType(jsonObject.getInteger("activityType"));
             activityInfo.setActivityBeginTime(DateUtils.tempToDate(jsonObject.getLong("activityBeginTime")));
             activityInfo.setActivityBeginTime(DateUtils.tempToDate(jsonObject.getLong("activityBeginTime")));
@@ -88,13 +89,13 @@ public class KuaiShouActivityInfoServiceImpl extends ServiceImpl<KuaiShouActivit
         }
         }
         log.info("快分销招商数据更新数量:{}", activityInfoList.size());
         log.info("快分销招商数据更新数量:{}", activityInfoList.size());
         if (dataArray.size() >= 1000) {
         if (dataArray.size() >= 1000) {
-            getActivityInfo(cookie, offset + 1000);
+            getActivityInfo(regimentalId,cookie, offset + 1000);
         }
         }
     }
     }
 
 
     @Override
     @Override
-    public List<JSONObject> getActivityIdList() {
-        return activityInfoMapper.getActivityIdList();
+    public List<JSONObject> getActivityIdList(Long id ) {
+        return activityInfoMapper.getActivityIdList(id);
     }
     }
 
 
     @Override
     @Override

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

@@ -121,7 +121,7 @@ public class KuaishouSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyCh
     }
     }
 
 
     @Override
     @Override
-    public String getCookie() {
+    public List<JSONObject> getCookie() {
         return supplyChainMapper.getCookie();
         return supplyChainMapper.getCookie();
     }
     }