mdbq 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

mdbq/aggregation/query_data.py

@@ -272,7 +272,7 @@ class GroupBy:
         elif '宝贝指标' in tabel_name:
             """ 聚合时不可以加商家编码，编码有些是空白，有些是 0 """
             df.fillna(0, inplace=True)
-            df = df[(df['销售额'] != 0) | (df['退款额'] != 0)]
+            # df = df[(df['销售额'] != 0) | (df['退款额'] != 0)]  # 注释掉, 因为后续使用生意经作为基准合并推广表，需确保所有商品id 齐全
             df = df.groupby(['日期', '宝贝id', '行业类目'], as_index=False).agg(
                 **{'销售额': ('销售额', np.min),
                    '销售量': ('销售量', np.min),
@@ -354,7 +354,7 @@ class GroupBy:
             print(f'<{tabel_name}>: Groupby 类尚未配置，数据为空')
             return pd.DataFrame({})
 
-    def performance(self):
+    def performance(self, bb_tg=True):
          # print(self.data_tgyj)
         tg, syj, idbm, pic, cost = (
             self.data_tgyj['推广数据_宝贝主体报表'],
@@ -369,10 +369,12 @@ 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(syj, df, how='left', left_on=['日期', '宝贝id'], right_on=['日期', '商品id'])
-        # # 推广表合并生意经 , 以推广数据为基准，销售数据可能不齐全
-        # df = pd.merge(df, syj, how='left', left_on=['日期', '商品id'], right_on=['日期', '宝贝id'])
+        if bb_tg is True:
+             # 生意经合并推广表，完整的数据表，包含全店所有推广、销售数据
+            df = pd.merge(syj, df, how='left', left_on=['日期', '宝贝id'], right_on=['日期', '商品id'])
+        else:
+            # 推广表合并生意经 , 以推广数据为基准，销售数据不齐全
+            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)
@@ -514,11 +516,14 @@ def data_aggregation(service_databases=[{}]):
                 df = g.groupby(df=df, tabel_name=tabel_name, is_maximize=True)  # 2. 聚合数据
                 # g.as_csv(df=df, filename=tabel_name + '.csv')
                 m.df_to_mysql(df=df, db_name=db_name, tabel_name=tabel_name)  # 3. 回传数据库
-            res = g.performance()   # 盈亏表，依赖其他表，单独做
-            m.df_to_mysql(df=res, db_name='聚合数据', tabel_name='商品销售')
+            res = g.performance(bb_tg=True)   # 盈亏表，依赖其他表，单独做
+            m.df_to_mysql(df=res, db_name='聚合数据', tabel_name='全店商品销售')
+            res = g.performance(bb_tg=False)  # 盈亏表，依赖其他表，单独做
+            m.df_to_mysql(df=res, db_name='聚合数据', tabel_name='推广商品销售')
 
     # optimize_data.op_data(service_databases=service_databases, days=3650)  # 立即启动对聚合数据的清理工作
 
 
 if __name__ == '__main__':
     data_aggregation(service_databases=[{'home_lx': 'mysql'}])
+    # optimize_data.op_data(service_databases=[{'company': 'mysql'}], days=3650)  # 立即启动对聚合数据的清理工作

{mdbq-0.4.0.dist-info → mdbq-0.4.1.dist-info}/METADATA

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

{mdbq-0.4.0.dist-info → mdbq-0.4.1.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=FEr1IWxMoxdEQSblQ7bu-hcHnpOmaFl5sZyjeqZSJDA,23992
+mdbq/aggregation/query_data.py,sha256=eQW8NvXie0HEpzPhU9AnKKw878TffwiDH3trvwvVbEs,24487
 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
@@ -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.4.0.dist-info/METADATA,sha256=5-qsRRrPT1OGYLWlVQlj3dnJZURPqK2EVVWzvMSjV_c,245
-mdbq-0.4.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-0.4.0.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-0.4.0.dist-info/RECORD,,
+mdbq-0.4.1.dist-info/METADATA,sha256=2L5Va0yp242Z4rtk0pSzw2AJqy4d19UUhYqHy2Jxhuk,245
+mdbq-0.4.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-0.4.1.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-0.4.1.dist-info/RECORD,,