mdbq 0.4.1__tar.gz → 0.4.3__tar.gz

{mdbq-0.4.1 → mdbq-0.4.3}/PKG-INFO

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

{mdbq-0.4.1 → mdbq-0.4.3}/mdbq/aggregation/query_data.py

@@ -377,8 +377,8 @@ class GroupBy:
             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)
-        df['商品毛利'] = df.apply(lambda x: x['销售额'] - x['商品成本'] * x['销售量'], axis=1)
+        df['商品成本'] = df.apply(lambda x: (x['成本价'] + x['销售额']/x['销售量'] * 0.11 + 6) * x['销售量'] if x['销售量'] > 0 else 0, axis=1)
+        df['商品毛利'] = df.apply(lambda x: x['销售额'] - x['商品成本'], axis=1)
         df['毛利率'] = df.apply(lambda x: round((x['销售额'] - x['商品成本']) / x['销售额'], 4) if x['销售额'] > 0 else 0, axis=1)
         df['盈亏'] = df.apply(lambda x: x['商品毛利'] - x['花费'], axis=1)
         return df
@@ -517,9 +517,9 @@ def data_aggregation(service_databases=[{}]):
                 # 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(bb_tg=True)   # 盈亏表，依赖其他表，单独做
-            m.df_to_mysql(df=res, db_name='聚合数据', tabel_name='全店商品销售')
+            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='推广商品销售')
+            m.df_to_mysql(df=res, db_name='聚合数据', tabel_name='_推广商品销售')
 
     # optimize_data.op_data(service_databases=service_databases, days=3650)  # 立即启动对聚合数据的清理工作
 

{mdbq-0.4.1 → mdbq-0.4.3}/mdbq/company/copysh.py

@@ -17,6 +17,7 @@ from mdbq.aggregation import query_data
 from mdbq.aggregation import optimize_data
 from mdbq.config import update_conf
 from mdbq.config import get_myconf
+from mdbq.mysql import mysql
 warnings.filterwarnings('ignore')
 
 

{mdbq-0.4.1 → mdbq-0.4.3}/mdbq.egg-info/PKG-INFO

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

{mdbq-0.4.1 → mdbq-0.4.3}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='mdbq',
-      version='0.4.1',
+      version='0.4.3',
       author='xigua, ',
       author_email="2587125111@qq.com",
       url='https://pypi.org/project/mdbsql',