Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/CheckSupplyChainJob.java
yumeng 1 year ago
parent
commit
8b5f0d8e3f

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

@@ -33,6 +33,7 @@ import cn.com.ctop.toutiao.modules.report.entity.BytedanceVideoEtlInfo;
 import cn.com.ctop.oa.modules.service.IWechatCheckinDataService;
 import cn.com.ctop.oa.modules.service.IWechatUserListService;
 import cn.com.ctop.toutiao.modules.report.service.IBytedanceReportService;
+import cn.com.ctop.toutiao.modules.report.service.IRuleByteDanceAccountService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -1877,9 +1878,16 @@ public class TestController {
         wechatNoListService.getNoDateByNo(start + " 00:00:00", end + " 23:59:59", "0");
     }
 
-    @GetMapping("getLiveToken")
-    public void getLiveToken() throws Exception {
-        refreshTokenService.getLiveKuaiShouAgentRefresh();
+    @Autowired
+    private IRuleByteDanceAccountService ruleByteDanceAccountService;
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    @GetMapping("getBalance")
+    public void getBalance(Long accountId) throws Exception {
+        save();
+        find();
     }
 
    /* public void save() {

+ 16 - 3
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/CheckSupplyChainJob.java

@@ -17,15 +17,28 @@ import java.util.Map;
 public class CheckSupplyChainJob {
 
     @XxlJob("checkSupplyChainJob")
-    public void execute() throws Exception {
+    public void checkSupplyChainJob() throws Exception {
+        String today = DateUtils.date2Str();
+        Map<String, Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("endDate", today);
+        paramMap.put("beginDate", today);
+        HttpUtils.httpGet("http://ruixuan.api.tjyourong.com.cn/isv/supply_chain/addList", paramMap, null);
+        XxlJobHelper.log(" --------当天供应链-快分销数据,执行完成-------- " + paramMap.toString());
+    }
+
+    @XxlJob("checkSupplyChainTwoDaysJob")
+    public void checkSupplyChainTwoDaysJob() throws Exception {
         String today = DateUtils.date2Str();
         //昨天
         String yesterday = DateUtils.getLastDay(today, 2);
+        String endDate = DateUtils.getLastDay(today, 1);
+        String beginDate = DateUtils.getLastDay(today, 2);
         Map<String, Object> paramMap = new HashMap<String, Object>();
-        paramMap.put("endDate", today);
-        paramMap.put("beginDate", yesterday);
+        paramMap.put("endDate", endDate);
+        paramMap.put("beginDate", beginDate);
         HttpUtils.httpGet("http://ruixuan.api.tjyourong.com.cn/isv/supply_chain/addList", paramMap, null);
         XxlJobHelper.log(" --------供应链-快分销更新发货状态数据,执行完成-------- " + paramMap.toString());
+        XxlJobHelper.log(" --------前两天供应链-快分销数据,执行完成-------- " + paramMap.toString());
     }