mdbq 0.3.5__py3-none-any.whl → 0.3.7__py3-none-any.whl

mdbq/aggregation/query_data.py

@@ -119,6 +119,7 @@ class MysqlDatasQuery:
             '订单数': 1,
             '退货量': 1,
             '退款额': 1,
+            '退款额_发货后': 1,
             '退货量_发货后': 1,
         }
         df = self.download.data_to_df(
@@ -204,7 +205,7 @@ class GroupBy:
             self.output = os.path.join('C:\\同步空间\\BaiduSyncdisk\\数据库导出')
         else:
             self.output = os.path.join('数据中心/数据库导出')
-        self.data_tgyj = {}
+        self.data_tgyj = {}  # 推广综合聚合数据表
 
     def groupby(self, df, tabel_name, is_maximize=True):
         """
@@ -278,6 +279,7 @@ class GroupBy:
                    '订单数': ('订单数', np.min),
                    '退货量': ('退货量', np.max),
                    '退款额': ('退款额', np.max),
+                   '退款额_发货后': ('退款额_发货后', np.max),
                    '退货量_发货后': ('退货量_发货后', np.max),
                    }
             )
@@ -292,7 +294,7 @@ class GroupBy:
             )
             self.data_tgyj.update(
                 {
-                    tabel_name: df[['日期', '宝贝id', '销售额', '销售量']],
+                    tabel_name: df[['日期', '宝贝id', '销售额', '销售量', '退款额_发货后', '退货量_发货后']],
                 }
             )
             return df
@@ -367,7 +369,10 @@ class GroupBy:
         df = df[['宝贝id', '商家编码', '商品图片', '成本价']]
         df = pd.merge(tg, df, how='left', left_on='商品id', right_on='宝贝id')
         df.drop(labels='宝贝id', axis=1, inplace=True)
-        df = pd.merge(df, syj, how='left', left_on=['日期', '商品id'], right_on=['日期', '宝贝id'])
+         # 生意经合并推广表，完整的数据表，包含所有推广、销售数据
+        df = pd.merge(syj, df, how='left', left_on=['日期', '宝贝id'], right_on=['日期', '商品id'])
+        # # 推广表合并生意经 , 以推广数据为基准，销售数据可能不齐全
+        # df = pd.merge(df, syj, how='left', left_on=['日期', '商品id'], right_on=['日期', '宝贝id'])
         df.drop(labels='宝贝id', axis=1, inplace=True)
         df.drop_duplicates(subset=['日期', '商品id', '花费', '销售额'], keep='last', inplace=True, ignore_index=True)
         df['商品成本'] = df.apply(lambda x: x['成本价'] + x['销售额']/x['销售量'] * 0.11 + 6 if x['销售量'] > 0 else 0, axis=1)
@@ -466,7 +471,7 @@ def data_aggregation(service_databases=[{}]):
     for service_database in service_databases:
         for service_name, database in service_database.items():
             sdq = MysqlDatasQuery(target_service=service_name)  # 实例化数据处理类
-            sdq.months = 1  # 设置数据周期， 1 表示近 2 个月
+            sdq.months = 36  # 设置数据周期， 1 表示近 2 个月
             g = GroupBy()  # 实例化数据聚合类
             # 实例化数据库连接
             username, password, host, port = get_myconf.select_config_values(target_service=service_name, database=database)
@@ -512,7 +517,7 @@ def data_aggregation(service_databases=[{}]):
             res = g.performance()   # 盈亏表，依赖其他表，单独做
             m.df_to_mysql(df=res, db_name='聚合数据', tabel_name='商品销售')
 
-    optimize_data.op_data(service_databases=service_databases, days=3650)  # 立即启动对聚合数据的清理工作
+    # optimize_data.op_data(service_databases=service_databases, days=3650)  # 立即启动对聚合数据的清理工作
 
 
 if __name__ == '__main__':

mdbq/mysql/data_types.py

@@ -69,7 +69,7 @@ class DataTypes:
         """ 更新 dataframe 的 dtypes 信息到 json 文件 """
         if not os.path.exists(path):
             os.makedirs(path)
-        json_file = os.path.join(path, 'df_dtypes.json')
+        json_file = os.path.join(path, 'mysql_types.json')
         if os.path.isfile(json_file):
             self.json_before(json_file=json_file)  # 更新本地json信息到 self.datas
 
@@ -143,7 +143,7 @@ class DataTypes:
         if os.path.isfile(path):
             self.json_before(json_file=path)  # 更新本地json信息到 self.datas
         elif os.path.isdir(path):
-            json_file = os.path.join(path, 'df_dtypes.json')
+            json_file = os.path.join(path, 'mysql_types.json')
             if os.path.isfile(json_file):
                 self.json_before(json_file=json_file)
             else:

mdbq/mysql/mysql.py

@@ -196,7 +196,7 @@ class MysqlUpload:
             path = os.path.join('C:\\同步空间\\BaiduSyncdisk\\自动0备份\\py\\数据更新\\support')
         else:
             path = os.path.join('/Users', getpass.getuser(), 'support')
-        # json_file = os.path.join(path, 'df_dtypes.json')
+        # json_file = os.path.join(path, 'mysql_types.json')
         # if os.path.isfile(json_file):
         d = data_types.DataTypes()
         # 从本地文件中读取 dtype 信息

{mdbq-0.3.5.dist-info → mdbq-0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 0.3.5
+Version: 0.3.7
 Home-page: https://pypi.org/project/mdbsql
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-0.3.5.dist-info → mdbq-0.3.7.dist-info}/RECORD

@@ -3,7 +3,7 @@ mdbq/__version__.py,sha256=y9Mp_8x0BCZSHsdLT_q5tX9wZwd5QgqrSIENLrb6vXA,62
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
 mdbq/aggregation/aggregation.py,sha256=TkxyIBowTuoNrhVkrgnYNXwNQXCX_xjh7wcYXdP65-E,58496
 mdbq/aggregation/optimize_data.py,sha256=jLAWtxPUuhpo4XTVrhKtT4xK3grs7r73ePQfLhxlu1I,779
-mdbq/aggregation/query_data.py,sha256=0Wo8AKHOuJ2m8wqmpQJSBJjD7s_7eL6Ou5lZjxfbR0g,23498
+mdbq/aggregation/query_data.py,sha256=oC3KuFgD4S1LHvo48nWYRmpztfWAQymV43BTQ4-2m5k,23993
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
@@ -21,8 +21,8 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
 mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mongo/mongo.py,sha256=q0B4wXDSTtXg_vMN7MPh6zdxl6tT68tM74LmdVNQQek,31892
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/data_types.py,sha256=JhKhSoj1FihCl_8yfjVqWOlISJ0hx6tBQR0qE7n-Z3U,11153
-mdbq/mysql/mysql.py,sha256=42IJOAWiSoic4m_u3_875F2IzKHIW-2dNWx7OYZ0Ub4,33901
+mdbq/mysql/data_types.py,sha256=Heb_bccgi2RL8YEwIxg7jyVdjdWuBN4n2J_5Uz_S-GQ,11157
+mdbq/mysql/mysql.py,sha256=QghST_eVHRn6HmDnBr6J5LFiGkp8qVHvqdYpFifEoqw,33903
 mdbq/mysql/s_query.py,sha256=6-8O9MHhi3-7n3isJ7t2kTCYL2mSBC_HrxSQmXM5UtI,7901
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -33,7 +33,7 @@ mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
 mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
 mdbq/pbix/refresh_all.py,sha256=USe3s5ws2Q-Gp9yUoFOAXJ4t0KVaekFULtAJaZkp448,5976
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-0.3.5.dist-info/METADATA,sha256=dLI22tO0ZRrr-bH-e55BpBIEV8jUn_L8y3y13VeBaGw,245
-mdbq-0.3.5.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-0.3.5.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-0.3.5.dist-info/RECORD,,
+mdbq-0.3.7.dist-info/METADATA,sha256=kIe4Fw077qj_XwMzwNvkACzPhLbRcppvlrlOUgXetZM,245
+mdbq-0.3.7.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-0.3.7.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-0.3.7.dist-info/RECORD,,