From 9463fbe4776e0f8de5cedbd83a869667b85fc195 Mon Sep 17 00:00:00 2001
From: lwl0608 <lwl0608@foxmail.com>
Date: Mon, 1 Jul 2024 15:33:44 +0800
Subject: [PATCH] fix post log

---
 cronjob/vas/user_income_calc.py | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/cronjob/vas/user_income_calc.py b/cronjob/vas/user_income_calc.py
index 41848e2..ecf23a2 100644
--- a/cronjob/vas/user_income_calc.py
+++ b/cronjob/vas/user_income_calc.py
@@ -41,11 +41,24 @@ group by t1.mid,t1.ymd
             mid_docs_map[mid].append(doc)
         print("week, len(mid_docs_map): {}".format(len(mid_docs_map)))
 
+        ymds = list()
+        while True:
+            if st >= et:
+                break
+            ymds.append(get_time_str_by_ts_v2(st, "%Y%m%d"))
+            st += 86400
+
         reqs = list()
         for mid, docs in mid_docs_map.items():
             q = {"_id": mid}
-            lis = list()
+            ymd_doc_map = dict()
             for d in docs:
+                ymd = safe_get_str(d, "ymd")
+                ymd_doc_map[ymd] = d
+
+            lis = list()
+            for ymd in ymds:
+                d = safe_get_dict(ymd_doc_map, ymd)
                 lis.append({
                     "date": safe_get_str(d, "ymd"),
                     "income": safe_get_int(d, "income")
@@ -117,6 +130,11 @@ group by t1.mid,t1.type_id
         self.get_week_dashboard()
         self.get_income_from_dashboard()
 
+    # s = S()
+    # s.proc()
 
-s = S()
-s.proc()
+
+et = get_today_zero_time()
+st = et - 7 * 86400
+
+print(ymds)