Browse Source

增加团长ID

yumeng 7 tháng trước cách đây
mục cha
commit
e836dda87b
26 tập tin đã thay đổi với 139 bổ sung143 xóa
  1. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
  2. 8 97
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouOrderLIstGetJob.java
  3. 6 3
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/MgsOrderLIstGetJob.java
  4. 6 3
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RocketOrderLIstGetJob.java
  5. 6 3
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/YuXiuOrderLIstGetJob.java
  6. 6 3
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/YufuOrderLIstGetJob.java
  7. 6 3
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/ZhiShuiOrderLIstGetJob.java
  8. 2 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaishouSupplyChain.java
  9. 12 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaishouSupplyChainMapper.xml
  10. 12 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/MgsSupplyChainMapper.xml
  11. 12 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/RocketSupplyChainMapper.xml
  12. 12 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/YuXiuSupplyChainMapper.xml
  13. 12 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/YufuSupplyChainMapper.xml
  14. 12 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/ZhiShuiSupplyChainMapper.xml
  15. 3 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaishouSupplyChainService.java
  16. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IMgsSupplyChainService.java
  17. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IYuXiuSupplyChainService.java
  18. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IZhiShuiSupplyChainService.java
  19. 1 6
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/RocketSupplyChainService.java
  20. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/YufuSupplyChainService.java
  21. 3 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouSupplyChainServiceImpl.java
  22. 3 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/MgsSupplyChainServiceImpl.java
  23. 3 7
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/RocketSupplyChainServiceImpl.java
  24. 3 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/YuXiuSupplyChainServiceImpl.java
  25. 3 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/YufuSupplyChainServiceImpl.java
  26. 3 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/ZhiShuiSupplyChainServiceImpl.java

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

@@ -210,7 +210,7 @@ public class TestController {
                             @Override
                             public void run() {
                                 try {
-                                    zhiShuiSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                                    zhiShuiSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, null);
                                 } catch (Exception e) {
                                     e.printStackTrace();
                                 }

+ 8 - 97
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouOrderLIstGetJob.java

@@ -95,102 +95,9 @@ public class KuaishouOrderLIstGetJob {
         System.err.println(days);
     }
 
-    /**
-     * 快分销-11、12月所有数据
-     **/
-    @XxlJob("allOrderGet")
-    public void allOrderGet() throws Exception {
-        log.info("-------------------------获取快分销订单上个月数据开始数据开始--------------------------");
-        //   List<String> dateList = new ArrayList<>();
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -93);
-        String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
-        List<String> days = DateUtils.getDays(startDate, endDate);
-
-        List<JSONObject> cookies = ikuaishouSupplyChainService.getCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        JSONArray hourList = KuaishouHourEnum.getHourList();
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        for (int z = 0; z < days.size(); z++) {
-            String date = days.get(z);
-            for (int i = 0; i < hourList.size(); i++) {
-                String hour = hourList.getString(i);
-                for (int j = 0; j < minSecList.size(); j++) {
-                    JSONObject minSecJson = minSecList.getJSONObject(j);
-                    String startTime = minSecJson.getString("startTime");
-                    String endTime = minSecJson.getString("endTime");
-                    String start = date + hour + startTime;
-                    String end = date + hour + endTime;
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                    Long orderCreateTimeStart = sdf.parse(start).getTime();
-                    Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                    for (int p = 0; p < cookies.size(); p++) {
-                        JSONObject cookieJson = cookies.get(p);
-                        String cookie = cookieJson.getString("cookie");
-                        ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
 
 
-                    }
-                }
-            }
-
-        }
-    }
-
 
-    /**
-     * 快分销-当前月所有数据
-     **/
-    @XxlJob("nowMonthyOrderGet")
-    public void nowMonthyOrderGet() throws Exception {
-        log.info("-------------------------获取快分销订单当前月数据开始数据开始--------------------------");
-        List<JSONObject> cookies = ikuaishouSupplyChainService.getCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -3);
-        String monthFirstDay = DateUtils.getMonthFirstDay();
-        List<String> days = DateUtils.getDays(monthFirstDay, endDate);
-        JSONArray hourList = KuaishouHourEnum.getHourList();
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        for (int z = 0; z < days.size(); z++) {
-            String date = days.get(z);
-            for (int i = 0; i < hourList.size(); i++) {
-                String hour = hourList.getString(i);
-                for (int j = 0; j < minSecList.size(); j++) {
-                    JSONObject minSecJson = minSecList.getJSONObject(j);
-                    String startTime = minSecJson.getString("startTime");
-                    String endTime = minSecJson.getString("endTime");
-                    String start = date + hour + startTime;
-                    String end = date + hour + endTime;
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                    Long orderCreateTimeStart = sdf.parse(start).getTime();
-                    Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                    for (int p = 0; p < cookies.size(); p++) {
-                        JSONObject cookieJson = cookies.get(p);
-                        String cookie = cookieJson.getString("cookie");
-                        fxNowService.submit(new Runnable() {
-                            @Override
-                            public void run() {
-                                try {
-                                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
-                                } catch (Exception e) {
-                                    e.printStackTrace();
-                                }
-                            }
-                        });
-                    }
-                }
-            }
-        }
-
-
-    }
 
 
     /**
@@ -224,7 +131,8 @@ public class KuaishouOrderLIstGetJob {
                 for (int p = 0; p < cookies.size(); p++) {
                     JSONObject cookieJson = cookies.get(p);
                     String cookie = cookieJson.getString("cookie");
-                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    Long regimentalId = cookieJson.getLong("id");
+                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,regimentalId);
                 }
             }
         }
@@ -262,7 +170,8 @@ public class KuaishouOrderLIstGetJob {
                 for (int p = 0; p < cookies.size(); p++) {
                     JSONObject cookieJson = cookies.get(p);
                     String cookie = cookieJson.getString("cookie");
-                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    Long regimentalId = cookieJson.getLong("id");
+                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,regimentalId);
                 }
 
             }
@@ -307,7 +216,8 @@ public class KuaishouOrderLIstGetJob {
                 for (int p = 0; p < cookies.size(); p++) {
                     JSONObject cookieJson = cookies.get(p);
                     String cookie = cookieJson.getString("cookie");
-                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    Long regimentalId = cookieJson.getLong("id");
+                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,regimentalId);
                 }
             }
         }
@@ -350,7 +260,8 @@ public class KuaishouOrderLIstGetJob {
                     for (int p = 0; p < cookies.size(); p++) {
                         JSONObject cookieJson = cookies.get(p);
                         String cookie = cookieJson.getString("cookie");
-                        ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                        Long regimentalId = cookieJson.getLong("id");
+                        ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
                     }
                 }
             }

+ 6 - 3
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/MgsOrderLIstGetJob.java

@@ -61,7 +61,8 @@ public class MgsOrderLIstGetJob {
                 for (int p = 0; p < cookies.size(); p++) {
                     JSONObject cookieJson = cookies.get(p);
                     String cookie = cookieJson.getString("cookie");
-                    mgsSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    Long regimentalId = cookieJson.getLong("id");
+                    mgsSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,regimentalId);
                 }
             }
         }
@@ -102,7 +103,8 @@ public class MgsOrderLIstGetJob {
                 for (int p = 0; p < cookies.size(); p++) {
                     JSONObject cookieJson = cookies.get(p);
                     String cookie = cookieJson.getString("cookie");
-                    mgsSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    Long regimentalId = cookieJson.getLong("id");
+                    mgsSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,regimentalId);
                 }
             }
         }
@@ -143,7 +145,8 @@ public class MgsOrderLIstGetJob {
                     for (int p = 0; p < cookies.size(); p++) {
                         JSONObject cookieJson = cookies.get(p);
                         String cookie = cookieJson.getString("cookie");
-                        mgsSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                        Long regimentalId = cookieJson.getLong("id");
+                        mgsSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
                     }
                 }
             }

+ 6 - 3
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RocketOrderLIstGetJob.java

@@ -61,7 +61,8 @@ public class RocketOrderLIstGetJob {
                 for (int p = 0; p < cookies.size(); p++) {
                     JSONObject cookieJson = cookies.get(p);
                     String cookie = cookieJson.getString("cookie");
-                    rocketSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    Long regimentalId = cookieJson.getLong("id");
+                    rocketSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
                 }
             }
         }
@@ -104,7 +105,8 @@ public class RocketOrderLIstGetJob {
                 for (int p = 0; p < cookies.size(); p++) {
                     JSONObject cookieJson = cookies.get(p);
                     String cookie = cookieJson.getString("cookie");
-                    rocketSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    Long regimentalId = cookieJson.getLong("id");
+                    rocketSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
                 }
             }
         }
@@ -145,7 +147,8 @@ public class RocketOrderLIstGetJob {
                     for (int p = 0; p < cookies.size(); p++) {
                         JSONObject cookieJson = cookies.get(p);
                         String cookie = cookieJson.getString("cookie");
-                        rocketSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                        Long regimentalId = cookieJson.getLong("id");
+                        rocketSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
                     }
                 }
             }

+ 6 - 3
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/YuXiuOrderLIstGetJob.java

@@ -59,7 +59,8 @@ public class YuXiuOrderLIstGetJob {
                 for (int p = 0; p < cookies.size(); p++) {
                     JSONObject cookieJson = cookies.get(p);
                     String cookie = cookieJson.getString("cookie");
-                    yuXiuSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    Long regimentalId = cookieJson.getLong("id");
+                    yuXiuSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,regimentalId);
                 }
             }
         }
@@ -102,7 +103,8 @@ public class YuXiuOrderLIstGetJob {
                 for (int p = 0; p < cookies.size(); p++) {
                     JSONObject cookieJson = cookies.get(p);
                     String cookie = cookieJson.getString("cookie");
-                    yuXiuSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    Long regimentalId = cookieJson.getLong("id");
+                    yuXiuSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,regimentalId);
                 }
             }
         }
@@ -143,7 +145,8 @@ public class YuXiuOrderLIstGetJob {
                     for (int p = 0; p < cookies.size(); p++) {
                         JSONObject cookieJson = cookies.get(p);
                         String cookie = cookieJson.getString("cookie");
-                        yuXiuSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                        Long regimentalId = cookieJson.getLong("id");
+                        yuXiuSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,regimentalId);
                     }
                 }
             }

+ 6 - 3
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/YufuOrderLIstGetJob.java

@@ -61,7 +61,8 @@ public class YufuOrderLIstGetJob {
                 for (int p = 0; p < cookies.size(); p++) {
                     JSONObject cookieJson = cookies.get(p);
                     String cookie = cookieJson.getString("cookie");
-                    yufuSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    Long regimentalId = cookieJson.getLong("id");
+                    yufuSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
                 }
             }
         }
@@ -102,7 +103,8 @@ public class YufuOrderLIstGetJob {
                 for (int p = 0; p < cookies.size(); p++) {
                     JSONObject cookieJson = cookies.get(p);
                     String cookie = cookieJson.getString("cookie");
-                    yufuSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    Long regimentalId = cookieJson.getLong("id");
+                    yufuSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
                 }
             }
         }
@@ -143,7 +145,8 @@ public class YufuOrderLIstGetJob {
                     for (int p = 0; p < cookies.size(); p++) {
                         JSONObject cookieJson = cookies.get(p);
                         String cookie = cookieJson.getString("cookie");
-                        yufuSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                        Long regimentalId = cookieJson.getLong("id");
+                        yufuSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
                     }
                 }
             }

+ 6 - 3
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/ZhiShuiOrderLIstGetJob.java

@@ -57,7 +57,8 @@ public class ZhiShuiOrderLIstGetJob {
                 for (int p = 0; p < cookies.size(); p++) {
                     JSONObject cookieJson = cookies.get(p);
                     String cookie = cookieJson.getString("cookie");
-                    zhiShuiSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    Long regimentalId = cookieJson.getLong("id");
+                    zhiShuiSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
                 }
             }
         }
@@ -100,7 +101,8 @@ public class ZhiShuiOrderLIstGetJob {
                 for (int p = 0; p < cookies.size(); p++) {
                     JSONObject cookieJson = cookies.get(p);
                     String cookie = cookieJson.getString("cookie");
-                    zhiShuiSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    Long regimentalId = cookieJson.getLong("id");
+                    zhiShuiSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
                 }
             }
         }
@@ -141,7 +143,8 @@ public class ZhiShuiOrderLIstGetJob {
                     for (int p = 0; p < cookies.size(); p++) {
                         JSONObject cookieJson = cookies.get(p);
                         String cookie = cookieJson.getString("cookie");
-                        zhiShuiSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                        Long regimentalId = cookieJson.getLong("id");
+                        zhiShuiSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
                     }
                 }
             }

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

@@ -42,6 +42,8 @@ public class KuaishouSupplyChain {
     @Excel(name = "订单ID", width = 15)
     @ApiModelProperty(value = "订单ID")
     private Long oid;
+
+    private Long regimentalId;
     /**
      * 商品ID
      */

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

@@ -5,6 +5,7 @@
 
     <insert id="replaceRuixuanSupplyChains">
         replace into ruixuan.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -36,6 +37,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -71,6 +73,7 @@
     </insert>
     <insert id="replaceMgsSupplyChains">
         replace into miaogousi.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -102,6 +105,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -135,6 +139,7 @@
     </insert>
     <insert id="replaceRocketSupplyChains">
         replace into rocket.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -166,6 +171,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -200,6 +206,7 @@
     </insert>
     <insert id="replaceYufuSupplyChains">
         replace into yufu.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -231,6 +238,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -263,6 +271,7 @@
     </insert>
     <insert id="replaceYuXiuSupplyChains">
         replace into yuxiu.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -294,6 +303,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -329,6 +339,7 @@
 
     <insert id="replaceZhiShuiSupplyChains">
         replace into zhishui.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -360,6 +371,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},

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

@@ -4,6 +4,7 @@
 
     <insert id="replaceRuixuanSupplyChains">
         replace into ruixuan.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -35,6 +36,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -70,6 +72,7 @@
     </insert>
     <insert id="replaceMgsSupplyChains">
         replace into miaogousi.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -101,6 +104,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -134,6 +138,7 @@
     </insert>
     <insert id="replaceRocketSupplyChains">
         replace into rocket.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -165,6 +170,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -199,6 +205,7 @@
     </insert>
     <insert id="replaceYufuSupplyChains">
         replace into yufu.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -230,6 +237,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -262,6 +270,7 @@
     </insert>
     <insert id="replaceYuXiuSupplyChains">
         replace into yuxiu.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -293,6 +302,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -325,6 +335,7 @@
     </insert>
     <insert id="replaceZhiShuiSupplyChains">
         replace into zhishui.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -356,6 +367,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},

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

@@ -3,6 +3,7 @@
 <mapper namespace="cn.com.ctop.kuaishou.modules.batch.mapper.RocketSupplyChainMapper">
     <insert id="replaceRuixuanSupplyChains">
         replace into ruixuan.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -34,6 +35,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -69,6 +71,7 @@
     </insert>
     <insert id="replaceMgsSupplyChains">
         replace into miaogousi.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -100,6 +103,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -133,6 +137,7 @@
     </insert>
     <insert id="replaceRocketSupplyChains">
         replace into rocket.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -164,6 +169,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -198,6 +204,7 @@
     </insert>
     <insert id="replaceYufuSupplyChains">
         replace into yufu.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -229,6 +236,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -261,6 +269,7 @@
     </insert>
     <insert id="replaceYuXiuSupplyChains">
         replace into yuxiu.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -292,6 +301,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -325,6 +335,7 @@
     </insert>
     <insert id="replaceZhiShuiSupplyChains">
         replace into zhishui.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -356,6 +367,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},

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

@@ -7,6 +7,7 @@
 
     <insert id="replaceRuixuanSupplyChains">
         replace into ruixuan.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -38,6 +39,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -73,6 +75,7 @@
     </insert>
     <insert id="replaceMgsSupplyChains">
         replace into miaogousi.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -104,6 +107,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -137,6 +141,7 @@
     </insert>
     <insert id="replaceRocketSupplyChains">
         replace into rocket.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -168,6 +173,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -202,6 +208,7 @@
     </insert>
     <insert id="replaceYufuSupplyChains">
         replace into yufu.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -233,6 +240,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -266,6 +274,7 @@
     </insert>
     <insert id="replaceYuXiuSupplyChains">
         replace into yuxiu.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -297,6 +306,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -329,6 +339,7 @@
     </insert>
     <insert id="replaceZhiShuiSupplyChains">
         replace into zhishui.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -360,6 +371,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},

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

@@ -5,6 +5,7 @@
 
     <insert id="replaceRuixuanSupplyChains">
         replace into ruixuan.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -36,6 +37,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -71,6 +73,7 @@
     </insert>
     <insert id="replaceMgsSupplyChains">
         replace into miaogousi.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -102,6 +105,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -135,6 +139,7 @@
     </insert>
     <insert id="replaceRocketSupplyChains">
         replace into rocket.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -166,6 +171,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -200,6 +206,7 @@
     </insert>
     <insert id="replaceYufuSupplyChains">
         replace into yufu.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -231,6 +238,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -264,6 +272,7 @@
     </insert>
     <insert id="replaceYuXiuSupplyChains">
         replace into yuxiu.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -295,6 +304,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -328,6 +338,7 @@
     </insert>
     <insert id="replaceZhiShuiSupplyChains">
         replace into zhishui.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -359,6 +370,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},

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

@@ -5,6 +5,7 @@
 
     <insert id="replaceRuixuanSupplyChains">
         replace into ruixuan.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -36,6 +37,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -71,6 +73,7 @@
     </insert>
     <insert id="replaceMgsSupplyChains">
         replace into miaogousi.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -102,6 +105,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -135,6 +139,7 @@
     </insert>
     <insert id="replaceRocketSupplyChains">
         replace into rocket.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -166,6 +171,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -200,6 +206,7 @@
     </insert>
     <insert id="replaceYufuSupplyChains">
         replace into yufu.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -231,6 +238,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -264,6 +272,7 @@
     </insert>
     <insert id="replaceYuXiuSupplyChains">
         replace into yuxiu.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -295,6 +304,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -327,6 +337,7 @@
     </insert>
     <insert id="replaceZhiShuiSupplyChains">
         replace into zhishui.kuaishou_supply_chain(
+        regimental_id,
         oid,
         item_id,
         item_title,
@@ -358,6 +369,7 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            #{add.regimentalId},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},

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

@@ -15,7 +15,7 @@ import java.util.Map;
  * @version V1.0
  */
 public interface IKuaishouSupplyChainService extends IService<KuaishouSupplyChain> {
-    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception;
+    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd, Long regimentalId) throws Exception;
 
     List<JSONObject> getCookie();
 
@@ -44,7 +44,7 @@ public interface IKuaishouSupplyChainService extends IService<KuaishouSupplyChai
 
     List<JSONObject> getRocketDataList(Long statDate);
 
-    void getCcrInfo(String cookie, Integer offset, String type,String activityKeyWord) throws InterruptedException;
+    void getCcrInfo(String cookie, Integer offset, String type, String activityKeyWord) throws InterruptedException;
 
     List<JSONObject> getMgsCookie();
 
@@ -61,7 +61,7 @@ public interface IKuaishouSupplyChainService extends IService<KuaishouSupplyChai
 
     List<String> getActivityKeyWord(String yesDate, String ruixuan);
 
-    void getSellerInfo(String cookie, Integer offset, String db,String date) throws InterruptedException;
+    void getSellerInfo(String cookie, Integer offset, String db, String date) throws InterruptedException;
 
     void deleteItemBindCourtshipByDate(Long date);
 

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

@@ -15,7 +15,7 @@ import java.util.Map;
  * @version V1.0
  */
 public interface IMgsSupplyChainService extends IService<KuaishouSupplyChain> {
-    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception;
+    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd, Long regimentalId) throws Exception;
 
     List<JSONObject> getCookie();
 }

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

@@ -6,7 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface IYuXiuSupplyChainService {
-    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception;
+    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd, Long regimentalId) throws Exception;
 
     List<JSONObject> getCookie();
 }

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

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import java.util.List;
 
 public interface IZhiShuiSupplyChainService {
-    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception;
+    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd,Long regimentalId) throws Exception;
 
     List<JSONObject> getCookie();
 }

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

@@ -11,14 +11,9 @@ import java.util.Map;
  * 快手电商-供应链订单信息
  */
 public interface RocketSupplyChainService extends IService<KuaishouSupplyChain> {
-    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception;
+    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd, Long regimentalId) throws Exception;
 
     List<JSONObject> getCookie();
 
 
-
-
-
-
-
 }

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

@@ -11,7 +11,7 @@ import java.util.Map;
  * 快手电商-供应链订单信息
  */
 public interface YufuSupplyChainService extends IService<KuaishouSupplyChain> {
-    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception;
+    void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd,Long regimentalId) throws Exception;
 
     List<JSONObject> getCookie();
 

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

@@ -55,7 +55,7 @@ public class KuaishouSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyCh
 
     @Transactional
     @Override
-    public void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception {
+    public void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd, Long regimentalId) throws Exception {
         Thread.sleep(1500);
         log.info("567团长抓取订单数据入参,开始时间:{},结束时间:{},数据:{}", DateUtils.tempToLongDateStr(orderCreateTimeStart), DateUtils.tempToLongDateStr(orderCreateTimeEnd), offset);
         Map<String, Object> params = new HashMap<>();
@@ -105,6 +105,7 @@ public class KuaishouSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyCh
         for (int i = 0; i < list.size(); i++) {
             JSONObject jsonObject = list.getJSONObject(i);
             KuaishouSupplyChain supplyChain = new KuaishouSupplyChain();
+            supplyChain.setRegimentalId(regimentalId);
             supplyChain.setOid(jsonObject.getLong("oid"));
             JSONObject item = jsonObject.getJSONArray("itemList").getJSONObject(0);
             Long itemId = null;
@@ -200,7 +201,7 @@ public class KuaishouSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyCh
         }
 
         if (list.size() >= 100) {
-            getOrderList(cookie, offset + 100, orderCreateTimeStart, orderCreateTimeEnd);
+            getOrderList(cookie, offset + 100, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
         }
 
     }

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

@@ -55,7 +55,7 @@ public class MgsSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyChainMa
 
     @Transactional
     @Override
-    public void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception {
+    public void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd, Long regimentalId) throws Exception {
         Thread.sleep(1000);
         log.info("mgs团长抓取订单数据入参,开始时间:{},结束时间:{},数据:{}", DateUtils.tempToLongDateStr(orderCreateTimeStart), DateUtils.tempToLongDateStr(orderCreateTimeEnd), offset);
         Map<String, Object> params = new HashMap<>();
@@ -105,6 +105,7 @@ public class MgsSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyChainMa
         for (int i = 0; i < list.size(); i++) {
             JSONObject jsonObject = list.getJSONObject(i);
             KuaishouSupplyChain supplyChain = new KuaishouSupplyChain();
+            supplyChain.setRegimentalId(regimentalId);
             supplyChain.setOid(jsonObject.getLong("oid"));
             JSONObject item = jsonObject.getJSONArray("itemList").getJSONObject(0);
             Long itemId = null;
@@ -196,7 +197,7 @@ public class MgsSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyChainMa
         }
 
         if (list.size() >= 100) {
-            getOrderList(cookie, offset + 100, orderCreateTimeStart, orderCreateTimeEnd);
+            getOrderList(cookie, offset + 100, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
         }
 
     }

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

@@ -45,14 +45,9 @@ public class RocketSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyChai
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    public static void main(String[] args) {
-        System.err.println(DateUtils.tempToLongDateStr(1706112000000L));
-    }
-
-
     @Transactional
     @Override
-    public void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception {
+    public void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd, Long regimentalId) throws Exception {
         Thread.sleep(1000);
         log.info("rocket团长抓取订单数据入参,开始时间:{},结束时间:{},数据:{}", DateUtils.tempToLongDateStr(orderCreateTimeStart), DateUtils.tempToLongDateStr(orderCreateTimeEnd), offset);
         Map<String, Object> params = new HashMap<>();
@@ -102,6 +97,7 @@ public class RocketSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyChai
         for (int i = 0; i < list.size(); i++) {
             JSONObject jsonObject = list.getJSONObject(i);
             KuaishouSupplyChain supplyChain = new KuaishouSupplyChain();
+            supplyChain.setRegimentalId(regimentalId);
             supplyChain.setOid(jsonObject.getLong("oid"));
             JSONObject item = jsonObject.getJSONArray("itemList").getJSONObject(0);
             Long itemId = null;
@@ -192,7 +188,7 @@ public class RocketSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyChai
         }
 
         if (list.size() >= 100) {
-            getOrderList(cookie, offset + 100, orderCreateTimeStart, orderCreateTimeEnd);
+            getOrderList(cookie, offset + 100, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
         }
 
     }

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

@@ -42,7 +42,7 @@ public class YuXiuSupplyChainServiceImpl implements IYuXiuSupplyChainService {
 
     @Transactional
     @Override
-    public void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception {
+    public void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd, Long regimentalId) throws Exception {
         Thread.sleep(1000);
         log.info("yuxiu团长抓取订单数据入参,开始时间:{},结束时间:{},数据:{}", DateUtils.tempToLongDateStr(orderCreateTimeStart), DateUtils.tempToLongDateStr(orderCreateTimeEnd), offset);
         Map<String, Object> params = new HashMap<>();
@@ -92,6 +92,7 @@ public class YuXiuSupplyChainServiceImpl implements IYuXiuSupplyChainService {
         for (int i = 0; i < list.size(); i++) {
             JSONObject jsonObject = list.getJSONObject(i);
             KuaishouSupplyChain supplyChain = new KuaishouSupplyChain();
+            supplyChain.setRegimentalId(regimentalId);
             supplyChain.setOid(jsonObject.getLong("oid"));
             JSONObject item = jsonObject.getJSONArray("itemList").getJSONObject(0);
             Long itemId = null;
@@ -183,7 +184,7 @@ public class YuXiuSupplyChainServiceImpl implements IYuXiuSupplyChainService {
             e.printStackTrace();
         }
         if (list.size() >= 100) {
-            getOrderList(cookie, offset + 100, orderCreateTimeStart, orderCreateTimeEnd);
+            getOrderList(cookie, offset + 100, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
         }
 
     }

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

@@ -50,7 +50,7 @@ public class YufuSupplyChainServiceImpl extends ServiceImpl<YufuSupplyChainMappe
 
     @Transactional
     @Override
-    public void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception {
+    public void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd, Long regimentalId) throws Exception {
         Thread.sleep(1000);
         log.info("yufu团长抓取订单数据入参,开始时间:{},结束时间:{},数据:{}", DateUtils.tempToLongDateStr(orderCreateTimeStart), DateUtils.tempToLongDateStr(orderCreateTimeEnd), offset);
         Map<String, Object> params = new HashMap<>();
@@ -100,6 +100,7 @@ public class YufuSupplyChainServiceImpl extends ServiceImpl<YufuSupplyChainMappe
         for (int i = 0; i < list.size(); i++) {
             JSONObject jsonObject = list.getJSONObject(i);
             KuaishouSupplyChain supplyChain = new KuaishouSupplyChain();
+            supplyChain.setRegimentalId(regimentalId);
             supplyChain.setOid(jsonObject.getLong("oid"));
             JSONObject item = jsonObject.getJSONArray("itemList").getJSONObject(0);
             Long itemId = null;
@@ -187,7 +188,7 @@ public class YufuSupplyChainServiceImpl extends ServiceImpl<YufuSupplyChainMappe
             e.printStackTrace();
         }
         if (list.size() >= 100) {
-            getOrderList(cookie, offset + 100, orderCreateTimeStart, orderCreateTimeEnd);
+            getOrderList(cookie, offset + 100, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
         }
 
     }

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

@@ -40,7 +40,7 @@ public class ZhiShuiSupplyChainServiceImpl implements IZhiShuiSupplyChainService
 
     @Transactional
     @Override
-    public void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd) throws Exception {
+    public void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd, Long regimentalId) throws Exception {
         Thread.sleep(1000);
         log.info("zhishui团长抓取订单数据入参,开始时间:{},结束时间:{},数据:{}", DateUtils.tempToLongDateStr(orderCreateTimeStart), DateUtils.tempToLongDateStr(orderCreateTimeEnd), offset);
         Map<String, Object> params = new HashMap<>();
@@ -90,6 +90,7 @@ public class ZhiShuiSupplyChainServiceImpl implements IZhiShuiSupplyChainService
         for (int i = 0; i < list.size(); i++) {
             JSONObject jsonObject = list.getJSONObject(i);
             KuaishouSupplyChain supplyChain = new KuaishouSupplyChain();
+            supplyChain.setRegimentalId(regimentalId);
             supplyChain.setOid(jsonObject.getLong("oid"));
             JSONObject item = jsonObject.getJSONArray("itemList").getJSONObject(0);
             Long itemId = null;
@@ -175,7 +176,7 @@ public class ZhiShuiSupplyChainServiceImpl implements IZhiShuiSupplyChainService
             e.printStackTrace();
         }
         if (list.size() >= 100) {
-            getOrderList(cookie, offset + 100, orderCreateTimeStart, orderCreateTimeEnd);
+            getOrderList(cookie, offset + 100, orderCreateTimeStart, orderCreateTimeEnd, regimentalId);
         }
 
     }