Browse Source

快分销数据增加招商信息

yumeng 2 năm trước cách đây
mục cha
commit
548847efcb
16 tập tin đã thay đổi với 912 bổ sung11 xóa
  1. 24 0
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java
  2. 65 6
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouOrderLIstGetJob.java
  3. 249 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouActivityItemList.java
  4. 103 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouActivityInfo.java
  5. 2 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaishouSupplyChain.java
  6. 21 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouActivityInfoMapper.java
  7. 23 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouActivityItemListMapper.java
  8. 35 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouActivityInfoMapper.xml
  9. 93 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouActivityItemListMapper.xml
  10. 6 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaishouSupplyChainMapper.xml
  11. 19 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouActivityInfoService.java
  12. 19 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouActivityItemListService.java
  13. 3 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaishouSupplyChainService.java
  14. 98 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouActivityInfoServiceImpl.java
  15. 147 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouActivityItemListServiceImpl.java
  16. 5 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouSupplyChainServiceImpl.java

+ 24 - 0
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -340,6 +340,28 @@ public class DateUtils extends PropertyEditorSupport {
         return new Timestamp(millis);
     }
 
+
+    public static String tempToDate(long millis) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date d1 = new Date(millis);
+        String d2 = simpleDateFormat.format(d1);
+        return d2;
+    }
+
+
+    public static String temp13ToDate(long millis) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date d1 = new Date(millis);
+        String d2 = simpleDateFormat.format(d1);
+        return d2;
+    }
+
+
+    public static void main(String[] args) {
+        String date = tempToDate(1656518400000L);
+        System.err.println(date);
+    }
+
     /**
      * 以字符形式表示的时间戳
      *
@@ -881,6 +903,8 @@ public class DateUtils extends PropertyEditorSupport {
     }
 
 
+
+
     /**
      * String类型 转换为Date, 如果参数长度为10 转换格式”yyyy-MM-dd“ 如果参数长度为19 转换格式”yyyy-MM-dd
      * HH:mm:ss“ * @param text String类型的时间值

+ 65 - 6
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouOrderLIstGetJob.java

@@ -3,6 +3,8 @@ package cn.com.ctop.job.kuaishou.handler;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.Enums.KuaishouHourEnum;
 import cn.com.ctop.kuaishou.modules.batch.Enums.KuaishouMinSecEnum;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouActivityInfoService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouActivityItemListService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouSupplyChainService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -12,11 +14,13 @@ import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.print.DocFlavor;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Component
@@ -24,6 +28,55 @@ public class KuaishouOrderLIstGetJob {
 
     @Autowired
     private IKuaishouSupplyChainService ikuaishouSupplyChainService;
+    @Autowired
+    private IKuaiShouActivityInfoService activityInfoService;
+    @Autowired
+    private IKuaiShouActivityItemListService activityItemListService;
+
+
+    /**
+     * 快分销-招商活动商品数据同步
+     **/
+    @XxlJob("getActivityItemList")
+    public void getActivityItemList() throws Exception {
+        log.info("-------------------------快分销招商活动商品数据开始--------------------------");
+        String cookie = ikuaishouSupplyChainService.getCookie();
+        if (Check.isNull(cookie)) {
+            log.error("cookie数据为空");
+            return;
+        }
+
+        List<Long> activityIdList = activityInfoService.getActivityIdList();
+        if(!Check.isNull(activityIdList)){
+            for (int i = 0; i < activityIdList.size(); i++) {
+                Long activityId = activityIdList.get(i);
+                activityItemListService.getActivityItemList(cookie, 0,activityId);
+                Thread.sleep(1000);
+            }
+
+
+        }
+
+
+
+    }
+
+
+    /**
+     * 快分销-招商活动数据同步
+     **/
+    @XxlJob("getActivityInfo")
+    public void getActivityInfo() throws Exception {
+        log.info("-------------------------快分销招商活动数据开始--------------------------");
+        String cookie = ikuaishouSupplyChainService.getCookie();
+        if (Check.isNull(cookie)) {
+            log.error("cookie数据为空");
+            return;
+        }
+        activityInfoService.getActivityInfo(cookie, 0);
+
+
+    }
 
 
     /**
@@ -97,6 +150,7 @@ public class KuaishouOrderLIstGetJob {
         String cookie = ikuaishouSupplyChainService.getCookie();
         JSONArray hourList = KuaishouHourEnum.getHourList();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+        Map<Long, Long> itemMap = activityItemListService.getItemMap();
         for (int z = 0; z < dateList.size(); z++) {
             String date = dateList.get(z);
             for (int i = 0; i < hourList.size(); i++) {
@@ -112,7 +166,7 @@ public class KuaishouOrderLIstGetJob {
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     Long orderCreateTimeStart = sdf.parse(start).getTime();
                     Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,itemMap);
 
                 }
             }
@@ -138,6 +192,7 @@ public class KuaishouOrderLIstGetJob {
         List<String> days = DateUtils.getDays(monthFirstDay, endDate);
         JSONArray hourList = KuaishouHourEnum.getHourList();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+        Map<Long, Long> itemMap = activityItemListService.getItemMap();
         for (int z = 0; z < days.size(); z++) {
             String date = days.get(z);
             for (int i = 0; i < hourList.size(); i++) {
@@ -153,7 +208,7 @@ public class KuaishouOrderLIstGetJob {
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     Long orderCreateTimeStart = sdf.parse(start).getTime();
                     Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,itemMap);
 
                 }
             }
@@ -178,6 +233,7 @@ public class KuaishouOrderLIstGetJob {
         String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
         JSONArray hourList = KuaishouHourEnum.getHourList();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+        Map<Long, Long> itemMap = activityItemListService.getItemMap();
         for (int i = 0; i < hourList.size(); i++) {
             String hour = hourList.getString(i);
             for (int j = 0; j < minSecList.size(); j++) {
@@ -191,7 +247,7 @@ public class KuaishouOrderLIstGetJob {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 Long orderCreateTimeStart = sdf.parse(start).getTime();
                 Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,itemMap);
 
             }
         }
@@ -214,6 +270,7 @@ public class KuaishouOrderLIstGetJob {
         String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
         JSONArray hourList = KuaishouHourEnum.getHourList();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+        Map<Long, Long> itemMap = activityItemListService.getItemMap();
         for (int i = 0; i < hourList.size(); i++) {
             String hour = hourList.getString(i);
             for (int j = 0; j < minSecList.size(); j++) {
@@ -227,7 +284,7 @@ public class KuaishouOrderLIstGetJob {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 Long orderCreateTimeStart = sdf.parse(start).getTime();
                 Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,itemMap);
 
             }
         }
@@ -248,6 +305,7 @@ public class KuaishouOrderLIstGetJob {
         String date = DateUtils.getNowDate("yyyy-MM-dd");
         Integer nowHour = DateUtils.getNowHour();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+        Map<Long, Long> itemMap = activityItemListService.getItemMap();
         for (int j = 0; j < minSecList.size(); j++) {
             JSONObject minSecJson = minSecList.getJSONObject(j);
             String startTime = minSecJson.getString("startTime");
@@ -259,7 +317,7 @@ public class KuaishouOrderLIstGetJob {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Long orderCreateTimeStart = sdf.parse(start).getTime();
             Long orderCreateTimeEnd = sdf.parse(end).getTime();
-            ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+            ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,itemMap);
         }
     }
 
@@ -281,6 +339,7 @@ public class KuaishouOrderLIstGetJob {
         String date = DateUtils.getNowDate("yyyy-MM-dd");
         JSONArray hourList = KuaishouHourEnum.getHourList();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+        Map<Long, Long> itemMap = activityItemListService.getItemMap();
         for (int i = 0; i < hourList.size(); i++) {
             String hour = hourList.getString(i);
             for (int j = 0; j < minSecList.size(); j++) {
@@ -294,7 +353,7 @@ public class KuaishouOrderLIstGetJob {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 Long orderCreateTimeStart = sdf.parse(start).getTime();
                 Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,itemMap);
             }
         }
 

+ 249 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouActivityItemList.java

@@ -0,0 +1,249 @@
+package cn.com.ctop.kuaishou.modules.batch.controller;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 快分销-招商商品列表
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2023-01-10
+ */
+@Data
+@TableName("kuaishou_activity_item_list")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "kuaishou_activity_item_list对象", description = "快分销-招商商品列表")
+public class KuaiShouActivityItemList {
+
+    /**
+     * itemId
+     */
+    @Excel(name = "itemId", width = 15)
+    @ApiModelProperty(value = "itemId")
+    private Long itemId;
+    /**
+     * 商品标题
+     */
+    @Excel(name = "商品标题", width = 15)
+    @ApiModelProperty(value = "商品标题")
+    private String itemTitle;
+    /**
+     * 商品图片
+     */
+    @Excel(name = "商品图片", width = 15)
+    @ApiModelProperty(value = "商品图片")
+    private String itemImgUrl;
+    /**
+     * 商品链接
+     */
+    @Excel(name = "商品链接", width = 15)
+    @ApiModelProperty(value = "商品链接")
+    private String itemLinkUrl;
+    /**
+     * 库存
+     */
+    @Excel(name = "库存", width = 15)
+    @ApiModelProperty(value = "库存")
+    private Long itemStock;
+    /**
+     * 销量
+     */
+    @Excel(name = "销量", width = 15)
+    @ApiModelProperty(value = "销量")
+    private String itemVolume;
+    /**
+     * 商品价格
+     */
+    @Excel(name = "商品价格", width = 15)
+    @ApiModelProperty(value = "商品价格")
+    private Long itemPrice;
+    /**
+     * 商品类型
+     */
+    @Excel(name = "商品类型", width = 15)
+    @ApiModelProperty(value = "商品类型")
+    private String itemCategoryName;
+    /**
+     * itemLeafCategoryName
+     */
+    @Excel(name = "itemLeafCategoryName", width = 15)
+    @ApiModelProperty(value = "itemLeafCategoryName")
+    private String itemLeafCategoryName;
+    /**
+     * 佣金率
+     */
+    @Excel(name = "佣金率", width = 15)
+    @ApiModelProperty(value = "佣金率")
+    private Long itemCommissionRate;
+    /**
+     * 服务费率
+     */
+    @Excel(name = "服务费率", width = 15)
+    @ApiModelProperty(value = "服务费率")
+    private Long investmentPromotionRate;
+    /**
+     * 报名时间
+     */
+    @Excel(name = "报名时间", width = 15)
+    @ApiModelProperty(value = "报名时间")
+    private String itemApplyTime;
+    /**
+     * 报名状态 5失效
+     */
+    @Excel(name = "报名状态 5失效", width = 15)
+    @ApiModelProperty(value = "报名状态 5失效")
+    private Integer itemAuditStatus;
+    /**
+     * 用户昵称
+     */
+    @Excel(name = "用户昵称", width = 15)
+    @ApiModelProperty(value = "用户昵称")
+    private String sellerNickName;
+    /**
+     * reason
+     */
+    @Excel(name = "reason", width = 15)
+    @ApiModelProperty(value = "reason")
+    private String reason;
+    /**
+     * 账号
+     */
+    @Excel(name = "账号", width = 15)
+    @ApiModelProperty(value = "账号")
+    private Long sellerId;
+    /**
+     * 联系人ID
+     */
+    @Excel(name = "联系人ID", width = 15)
+    @ApiModelProperty(value = "联系人ID")
+    private Long contactId;
+    /**
+     * 联系人名称
+     */
+    @Excel(name = "联系人名称", width = 15)
+    @ApiModelProperty(value = "联系人名称")
+    private String contactName;
+    /**
+     * 联系人类型
+     */
+    @Excel(name = "联系人类型", width = 15)
+    @ApiModelProperty(value = "联系人类型")
+    private String contactType;
+    /**
+     * 联系人状态
+     */
+    @Excel(name = "联系人状态", width = 15)
+    @ApiModelProperty(value = "联系人状态")
+    private Integer contactStatus;
+    /**
+     * 联系人电话
+     */
+    @Excel(name = "联系人电话", width = 15)
+    @ApiModelProperty(value = "联系人电话")
+    private Long contactDetail;
+    /**
+     * 联系人创建时间
+     */
+    @Excel(name = "联系人创建时间", width = 15)
+    @ApiModelProperty(value = "联系人创建时间")
+    private String contactCreateTime;
+    /**
+     * 联系人修改时间
+     */
+    @Excel(name = "联系人修改时间", width = 15)
+    @ApiModelProperty(value = "联系人修改时间")
+    private String contactUpdateTime;
+    /**
+     * 商品状态 0下架
+     */
+    @Excel(name = "商品状态 0下架", width = 15)
+    @ApiModelProperty(value = "商品状态 0下架")
+    private Integer itemStatus;
+    /**
+     * 商品推广者信息展示
+     */
+    @Excel(name = "商品推广者信息展示", width = 15)
+    @ApiModelProperty(value = "商品推广者信息展示")
+    private String activityShowContactTypeList;
+    /**
+     * identity
+     */
+    @Excel(name = "identity", width = 15)
+    @ApiModelProperty(value = "identity")
+    private Integer identity;
+    /**
+     * 合作开始时间
+     */
+    @Excel(name = "合作开始时间", width = 15)
+    @ApiModelProperty(value = "合作开始时间")
+    private String cooperationBeginTime;
+    /**
+     * 合作结束时间
+     */
+    @Excel(name = "合作结束时间", width = 15)
+    @ApiModelProperty(value = "合作结束时间")
+    private String cooperationEndTime;
+    /**
+     * 链接
+     */
+    @Excel(name = "链接", width = 15)
+    @ApiModelProperty(value = "链接")
+    private String shareLink;
+    /**
+     * cooperationStatus
+     */
+    @Excel(name = "cooperationStatus", width = 15)
+    @ApiModelProperty(value = "cooperationStatus")
+    private Integer cooperationStatus;
+    /**
+     * 活动ID
+     */
+    @Excel(name = "活动ID", width = 15)
+    @ApiModelProperty(value = "活动ID")
+    private Long activityId;
+    /**
+     * preActivityId
+     */
+    @Excel(name = "preActivityId", width = 15)
+    @ApiModelProperty(value = "preActivityId")
+    private Long preActivityId;
+    /**
+     * investmentRemiseRate
+     */
+    @Excel(name = "investmentRemiseRate", width = 15)
+    @ApiModelProperty(value = "investmentRemiseRate")
+    private Long investmentRemiseRate;
+    /**
+     * applyAuthStatus
+     */
+    @Excel(name = "applyAuthStatus", width = 15)
+    @ApiModelProperty(value = "applyAuthStatus")
+    private Integer applyAuthStatus;
+    /**
+     * 活动类型
+     */
+    @Excel(name = "活动类型", width = 15)
+    @ApiModelProperty(value = "活动类型")
+    private Integer activityType;
+    /**
+     * sampleApplyType
+     */
+    @Excel(name = "sampleApplyType", width = 15)
+    @ApiModelProperty(value = "sampleApplyType")
+    private String sampleApplyType;
+}

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

@@ -0,0 +1,103 @@
+package cn.com.ctop.kuaishou.modules.batch.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 快分销-招商信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2023-01-10
+ */
+@Data
+@TableName("kuaishou_activity_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "kuaishou_activity_info对象", description = "快分销-招商信息")
+public class KuaiShouActivityInfo {
+
+    /**
+     * 活动ID
+     */
+    @Excel(name = "活动ID", width = 15)
+    @ApiModelProperty(value = "活动ID")
+    private Long activityId;
+    /**
+     * 活动标题
+     */
+    @Excel(name = "活动标题", width = 15)
+    @ApiModelProperty(value = "活动标题")
+    private String activityTitle;
+    /**
+     * 活动类型
+     */
+    @Excel(name = "活动类型", width = 15)
+    @ApiModelProperty(value = "活动类型")
+    private Integer activityType;
+    /**
+     * 招商开始时间
+     */
+    @Excel(name = "招商开始时间", width = 15)
+    @ApiModelProperty(value = "招商开始时间")
+    private String activityBeginTime;
+    /**
+     * 招商结束时间
+     */
+    @Excel(name = "招商结束时间", width = 15)
+    @ApiModelProperty(value = "招商结束时间")
+    private String activityEndTime;
+    /**
+     * 活动状态
+     */
+    @Excel(name = "活动状态", width = 15)
+    @ApiModelProperty(value = "活动状态")
+    private Integer activityStatus;
+    /**
+     * 报名数
+     */
+    @Excel(name = "报名数", width = 15)
+    @ApiModelProperty(value = "报名数")
+    private Integer applyItemCount;
+    /**
+     * 待审核
+     */
+    @Excel(name = "待审核", width = 15)
+    @ApiModelProperty(value = "待审核")
+    private Integer waitAuditItemCount;
+    /**
+     * 审核通过
+     */
+    @Excel(name = "审核通过", width = 15)
+    @ApiModelProperty(value = "审核通过")
+    private Integer auditPassItemCount;
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+}

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

@@ -180,6 +180,8 @@ public class KuaishouSupplyChain {
     @Excel(name = "结算服务费收入", width = 15)
     @ApiModelProperty(value = "结算服务费收入")
     private Long totalRegimentalSettleAmount;
+    private String statDate;
+    private Long itemCommissionRate;
     /**
      * 创建时间
      */

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

@@ -0,0 +1,21 @@
+package cn.com.ctop.kuaishou.modules.batch.mapper;
+
+import java.util.List;
+
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouActivityInfo;
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 快分销-招商信息
+ * @author jeecg-boot
+ * 2023-01-10
+ * @version V1.0
+ */
+public interface KuaiShouActivityInfoMapper extends BaseMapper<KuaiShouActivityInfo> {
+
+    void replace(@Param(value = "adds") List<KuaiShouActivityInfo> activityInfoList);
+
+    List<Long> getActivityIdList();
+}

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

@@ -0,0 +1,23 @@
+package cn.com.ctop.kuaishou.modules.batch.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.com.ctop.kuaishou.modules.batch.controller.KuaiShouActivityItemList;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 快分销-招商商品列表
+ *
+ * @author jeecg-boot
+ * 2023-01-10
+ * @version V1.0
+ */
+public interface KuaiShouActivityItemListMapper extends BaseMapper<KuaiShouActivityItemList> {
+
+    void replace(@Param(value = "adds") List<KuaiShouActivityItemList> activityInfoList);
+
+    List<JSONObject> itemList();
+}

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

@@ -0,0 +1,35 @@
+<?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.KuaiShouActivityInfoMapper">
+
+    <insert id="replace">
+        replace into ruixuan.kuaishou_activity_info(
+        activity_id,
+        activity_title,
+        activity_type,
+        activity_begin_time,
+        activity_end_time,
+        activity_status,
+        apply_item_count,
+        wait_audit_item_count,
+        audit_pass_item_count
+        )
+        values
+        <foreach collection="adds" item="add" separator=",">
+            (
+            #{add.activityId},
+            #{add.activityTitle},
+            #{add.activityType},
+            #{add.activityBeginTime},
+            #{add.activityEndTime},
+            #{add.activityStatus},
+            #{add.applyItemCount},
+            #{add.waitAuditItemCount},
+            #{add.auditPassItemCount}
+            )
+        </foreach>
+    </insert>
+    <select id="getActivityIdList" resultType="java.lang.Long">
+        select activity_id from  ruixuan.kuaishou_activity_info
+    </select>
+</mapper>

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

@@ -0,0 +1,93 @@
+<?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.KuaiShouActivityItemListMapper">
+
+    <insert id="replace">
+        replace into ruixuan.kuaishou_activity_item_list(
+        item_id,
+        item_title,
+        item_img_url ,
+        item_link_url,
+        item_stock,
+        item_volume,
+        item_price,
+        item_category_name,
+        item_leaf_category_name,
+        item_commission_rate,
+        investment_promotion_rate,
+        item_apply_time,
+        item_audit_status ,
+        seller_nick_name ,
+        reason,
+        seller_id,
+        contact_id,
+        contact_name,
+        contact_type,
+        contact_status,
+        contact_detail,
+        contact_create_time,
+        contact_update_time,
+        item_status,
+        activity_show_contact_type_list,
+        identity,
+        cooperation_begin_time,
+        cooperation_end_time,
+        share_link,
+        cooperation_status,
+        activity_id,
+        pre_activity_id,
+        investment_remise_rate,
+        apply_auth_status,
+        activity_type ,
+        sample_apply_type
+        )
+        values
+        <foreach collection="adds" item="add" separator=",">
+            (
+            #{add.itemId},
+            #{add.itemTitle},
+            #{add.itemImgUrl},
+            #{add.itemLinkUrl},
+            #{add.itemStock},
+            #{add.itemVolume},
+            #{add.itemPrice},
+            #{add.itemCategoryName},
+            #{add.itemLeafCategoryName},
+            #{add.itemCommissionRate},
+            #{add.investmentPromotionRate},
+            #{add.itemApplyTime},
+            #{add.itemAuditStatus},
+            #{add.sellerNickName},
+            #{add.reason},
+            #{add.sellerId},
+            #{add.contactId},
+            #{add.contactName},
+            #{add.contactType},
+            #{add.contactStatus},
+            #{add.contactDetail},
+            #{add.contactCreateTime},
+            #{add.contactUpdateTime},
+            #{add.itemStatus},
+            #{add.activityShowContactTypeList},
+            #{add.identity},
+            #{add.cooperationBeginTime},
+            #{add.cooperationEndTime},
+            #{add.shareLink},
+            #{add.cooperationStatus},
+            #{add.activityId},
+            #{add.preActivityId},
+            #{add.investmentRemiseRate},
+            #{add.applyAuthStatus},
+            #{add.activityType},
+            #{add.sampleApplyType}
+            )
+        </foreach>
+    </insert>
+
+    <select id="itemList" resultType="com.alibaba.fastjson.JSONObject">
+          select item_id as 'itemId',
+        item_commission_rate as 'itemCommissionRate'
+        from ruixuan.kuaishou_activity_item_list
+
+    </select>
+</mapper>

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

@@ -28,7 +28,9 @@
         base_amount,
         service_amount,
         regimental_promotion_amount,
-        total_regimental_settle_amount
+        total_regimental_settle_amount,
+        stat_date,
+        item_commission_rate
         )
         values
         <foreach collection="adds" item="add" separator=",">
@@ -57,7 +59,9 @@
             #{add.baseAmount},
             #{add.serviceAmount},
             #{add.regimentalPromotionAmount},
-            #{add.totalRegimentalSettleAmount}
+            #{add.totalRegimentalSettleAmount},
+            #{add.statDate},
+            #{add.itemCommissionRate}
             )
         </foreach>
     </insert>

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

@@ -0,0 +1,19 @@
+package cn.com.ctop.kuaishou.modules.batch.service;
+
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouActivityInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 快分销-招商信息
+ * @author jeecg-boot
+ * 2023-01-10
+ * @version V1.0
+ */
+public interface IKuaiShouActivityInfoService extends IService<KuaiShouActivityInfo> {
+
+    void getActivityInfo(String cookie, Integer offset) throws Exception;
+
+    List<Long> getActivityIdList();
+}

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

@@ -0,0 +1,19 @@
+package cn.com.ctop.kuaishou.modules.batch.service;
+
+import cn.com.ctop.kuaishou.modules.batch.controller.KuaiShouActivityItemList;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * 快分销-招商商品列表
+ * @author jeecg-boot
+ * 2023-01-10
+ * @version V1.0
+ */
+public interface IKuaiShouActivityItemListService extends IService<KuaiShouActivityItemList> {
+
+    void getActivityItemList(String cookie, Integer offset,Long activityId) throws Exception;
+
+    Map<Long, Long> getItemMap();
+}

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

@@ -3,6 +3,8 @@ package cn.com.ctop.kuaishou.modules.batch.service;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouSupplyChain;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * 快手电商-供应链订单信息
  * @author jeecg-boot
@@ -10,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @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, Map<Long,Long> itemMap) throws Exception;
 
     String getCookie();
 }

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

@@ -0,0 +1,98 @@
+package cn.com.ctop.kuaishou.modules.batch.service.impl;
+
+
+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.KuaiShouActivityInfo;
+import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouActivityInfoMapper;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouActivityInfoService;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.util.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 快分销-招商信息
+ *
+ * @author jeecg-boot
+ * 2023-01-10
+ * @version V1.0
+ */
+@Slf4j
+@Service
+public class KuaiShouActivityInfoServiceImpl extends ServiceImpl<KuaiShouActivityInfoMapper, KuaiShouActivityInfo> implements IKuaiShouActivityInfoService {
+    private static String activityUrl = "https://cps.kwaixiaodian.com/distribute/pc/investment/activity/list";
+    @Autowired
+    private ISendMessageService sendMessageService;
+    @Autowired
+    private KuaiShouActivityInfoMapper activityInfoMapper;
+
+    @Override
+    public void getActivityInfo(String cookie, Integer offset) throws Exception {
+        Map<String, Object> params = new HashMap<>();
+        params.put("limit", 1000);
+        params.put("offset", offset);
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Cookie", cookie);
+
+        String resultStr = HttpUtils.KuaiShouttpGetRequest(activityUrl, 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;
+        }
+        JSONArray dataArray = result.getJSONArray("data");
+        if (Check.isNull(dataArray)) {
+            log.error("快分销数据返回为data数据为空");
+            return;
+        }
+        List<KuaiShouActivityInfo> activityInfoList = new ArrayList<>();
+        for (int i = 0; i < dataArray.size(); i++) {
+            JSONObject jsonObject = dataArray.getJSONObject(i);
+            KuaiShouActivityInfo activityInfo = new KuaiShouActivityInfo();
+            activityInfo.setActivityId(jsonObject.getLong("activityId"));
+            activityInfo.setActivityTitle(jsonObject.getString("activityTitle"));
+            activityInfo.setActivityType(jsonObject.getInteger("activityType"));
+            activityInfo.setActivityBeginTime(DateUtils.tempToDate(jsonObject.getLong("activityBeginTime")));
+            activityInfo.setActivityEndTime(DateUtils.tempToDate(jsonObject.getLong("activityEndTime")));
+            activityInfo.setActivityStatus(jsonObject.getInteger("activityStatus"));
+            JSONObject activityItemDataInfo = jsonObject.getJSONObject("activityItemDataInfo");
+            if (!Check.isNull(activityItemDataInfo)) {
+                activityInfo.setApplyItemCount(activityItemDataInfo.getInteger("applyItemCount"));
+                activityInfo.setWaitAuditItemCount(activityItemDataInfo.getInteger("waitAuditItemCount"));
+                activityInfo.setAuditPassItemCount(activityItemDataInfo.getInteger("auditPassItemCount"));
+            }
+            activityInfoList.add(activityInfo);
+        }
+        if (!Check.isNull(activityInfoList)) {
+            activityInfoMapper.replace(activityInfoList);
+        }
+        log.info("快分销招商数据更新数量:{}",activityInfoList.size());
+        if (dataArray.size() >= 1000) {
+            getActivityInfo(cookie, offset + 1000);
+        }
+    }
+
+    @Override
+    public List<Long> getActivityIdList() {
+        return activityInfoMapper.getActivityIdList();
+    }
+}

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

@@ -0,0 +1,147 @@
+package cn.com.ctop.kuaishou.modules.batch.service.impl;
+
+
+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.controller.KuaiShouActivityItemList;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouActivityInfo;
+import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouActivityItemListMapper;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouActivityItemListService;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.util.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 快分销-招商商品列表
+ *
+ * @author jeecg-boot
+ * 2023-01-10
+ * @version V1.0
+ */
+@Slf4j
+@Service
+public class KuaiShouActivityItemListServiceImpl extends ServiceImpl<KuaiShouActivityItemListMapper, KuaiShouActivityItemList> implements IKuaiShouActivityItemListService {
+    private static String orderUrl = "https://cps.kwaixiaodian.com/distribute/pc/investment/activity/item/list";
+    @Autowired
+    private ISendMessageService sendMessageService;
+    @Autowired
+    private KuaiShouActivityItemListMapper activityItemListMapper;
+
+    @Override
+    public void getActivityItemList(String cookie, Integer offset, Long activityId) throws Exception {
+        Map<String, Object> params = new HashMap<>();
+        params.put("limit", 1000);
+        params.put("offset", offset);
+        params.put("activityId", activityId);
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Cookie", cookie);
+        String resultStr = HttpUtils.KuaiShouttpGetRequest(orderUrl, 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;
+        }
+        JSONArray dataArray = result.getJSONArray("data");
+        if (Check.isNull(dataArray)) {
+            log.error("快分销招商商品数据返回为data数据为空");
+            return;
+        }
+        List<KuaiShouActivityItemList> activityInfoList = new ArrayList<>();
+        for (int i = 0; i < dataArray.size(); i++) {
+            JSONObject jsonObject = dataArray.getJSONObject(i);
+            KuaiShouActivityItemList item = new KuaiShouActivityItemList();
+            item.setItemId(jsonObject.getLong("itemId"));
+            item.setItemTitle(jsonObject.getString("itemTitle"));
+            item.setItemImgUrl(jsonObject.getString("itemImgUrl"));
+            item.setItemLinkUrl(jsonObject.getString("itemLinkUrl"));
+            item.setItemStock(jsonObject.getLong("itemStock"));
+            item.setItemVolume(jsonObject.getString("itemVolume"));
+            item.setItemPrice(jsonObject.getLong("itemPrice"));
+            item.setItemCategoryName(jsonObject.getString("itemCategoryName"));
+            item.setItemLeafCategoryName(jsonObject.getString("itemLeafCategoryName"));
+            item.setItemCommissionRate(jsonObject.getLong("itemCommissionRate"));
+            item.setInvestmentPromotionRate(jsonObject.getLong("investmentPromotionRate"));
+            item.setItemApplyTime(DateUtils.temp13ToDate(jsonObject.getLong("itemApplyTime")));
+            item.setItemAuditStatus(jsonObject.getInteger("itemAuditStatus"));
+            item.setSellerNickName(filterSupplement(jsonObject.getString("sellerNickName")));
+            item.setReason(jsonObject.getString("reason"));
+            item.setSellerId(jsonObject.getLong("sellerId"));
+            JSONArray contactList = jsonObject.getJSONArray("contactList");
+            if (!Check.isNull(contactList)) {
+                JSONObject contacJson = contactList.getJSONObject(0);
+                item.setContactId(contacJson.getLong("contactId"));
+                item.setContactName(contacJson.getString("contactName"));
+                item.setContactType(contacJson.getString("contactType"));
+                item.setContactStatus(contacJson.getInteger("contactStatus"));
+                item.setContactDetail(contacJson.getLong("contactDetail"));
+                item.setContactCreateTime(DateUtils.temp13ToDate(contacJson.getLong("createTime")));
+                item.setContactUpdateTime(DateUtils.temp13ToDate(contacJson.getLong("updateTime")));
+            }
+            item.setItemStatus(jsonObject.getInteger("itemStatus"));
+            item.setActivityShowContactTypeList(jsonObject.getString("activityShowContactTypeList"));
+            item.setIdentity(jsonObject.getInteger("identity"));
+            item.setCooperationBeginTime(DateUtils.temp13ToDate(jsonObject.getLong("cooperationBeginTime")));
+            item.setCooperationEndTime(DateUtils.temp13ToDate(jsonObject.getLong("cooperationEndTime")));
+            item.setShareLink(jsonObject.getString("shareLink"));
+            item.setCooperationStatus(jsonObject.getInteger("cooperationStatus"));
+            item.setActivityId(jsonObject.getLong("activityId"));
+            item.setPreActivityId(jsonObject.getLong("preActivityId"));
+            item.setInvestmentRemiseRate(jsonObject.getLong("investmentRemiseRate"));
+            item.setApplyAuthStatus(jsonObject.getInteger("applyAuthStatus"));
+            item.setActivityType(jsonObject.getInteger("activityType"));
+            item.setSampleApplyType(jsonObject.getString("sampleApplyType"));
+            activityInfoList.add(item);
+
+        }
+        if (!Check.isNull(activityInfoList)) {
+            activityItemListMapper.replace(activityInfoList);
+        }
+        log.info("快分销招商商品数据更新数量:{}", activityInfoList.size());
+        if (dataArray.size() >= 1000) {
+            getActivityItemList(cookie, offset + 1000, activityId);
+        }
+    }
+
+    @Override
+    public Map<Long, Long> getItemMap() {
+        Map<Long, Long> returnMap = new HashMap<>();
+        List<JSONObject> list = activityItemListMapper.itemList();
+        if (!Check.isNull(list)) {
+            for (int i = 0; i < list.size(); i++) {
+                JSONObject jsonObject = list.get(i);
+                returnMap.put(jsonObject.getLong("itemId"), jsonObject.getLong("itemCommissionRate"));
+            }
+        }
+
+        return returnMap;
+    }
+
+    public static String filterSupplement(String content) {
+        StringBuilder sb = new StringBuilder();
+        for (char ch : content.toCharArray()) {
+            if (!Character.isHighSurrogate(ch) && !Character.isLowSurrogate(ch)) {
+                sb.append(ch);
+            }
+        }
+        return sb.toString();
+    }
+}

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

@@ -10,6 +10,7 @@ import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouSupplyChainService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -37,7 +38,7 @@ public class KuaishouSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyCh
     private KuaishouSupplyChainMapper supplyChainMapper;
 
     @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, Map<Long, Long> itemMap) throws Exception {
         Map<String, Object> params = new HashMap<>();
         if (!Check.isNull(orderCreateTimeStart)) {
             params.put("orderCreateTimeStart", orderCreateTimeStart);
@@ -106,12 +107,14 @@ public class KuaishouSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyCh
             supplyChain.setServiceAmount(jsonObject.getLong("serviceAmount"));
             supplyChain.setRegimentalPromotionAmount(jsonObject.getLong("regimentalPromotionAmount"));
             supplyChain.setTotalRegimentalSettleAmount(jsonObject.getLong("totalRegimentalSettleAmount"));
+            supplyChain.setStatDate(DateUtils.tempToDate(jsonObject.getLong("orderCreateTime")));
+            supplyChain.setItemCommissionRate(itemMap.get(item.getLong("itemId")));
             supplyChains.add(supplyChain);
         }
         supplyChainMapper.replace(supplyChains);
         Thread.sleep(2000L);
         if (list.size() >= 5000) {
-            getOrderList(cookie, offset + 5000, orderCreateTimeStart, orderCreateTimeEnd);
+            getOrderList(cookie, offset + 5000, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
         }
 
     }