mdbq 0.2.9__tar.gz → 0.3.1__tar.gz

{mdbq-0.2.9 → mdbq-0.3.1}/PKG-INFO

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

{mdbq-0.2.9 → mdbq-0.3.1}/mdbq/aggregation/query_data.py

@@ -372,7 +372,8 @@ class GroupBy:
         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['花费'], axis=1)
+        df['毛利率'] = df.apply(lambda x: round(x['销售额'] - x['商品成本'] / x['销售额'], 4), axis=1)
+        df['盈亏'] = df.apply(lambda x: x['商品毛利'] - x['花费'], axis=1)
         return df
 
     def as_csv(self, df, filename, path=None, encoding='utf-8_sig',
@@ -453,8 +454,7 @@ class GroupBy:
                 df.sort_values(st_ascend, ascending=ascend, ignore_index=True, inplace=True)
             except:
                 print(f'{filename}: sort_values排序参数错误！')
-        df.to_excel(os.path.join(path, filename + '.xlsx'),
-                    index=index, header=header, engine=engine, freeze_panes=freeze_panes)
+        df.to_excel(os.path.join(path, filename + '.xlsx'), index=index, header=header, engine=engine, freeze_panes=freeze_panes)
         
         
 def data_aggregation(service_databases=[{}]):
@@ -510,7 +510,7 @@ 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()   # 盈亏表，依赖其他表，单独做
-            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.2.9 → mdbq-0.3.1}/mdbq/mysql/mysql.py

@@ -1,6 +1,7 @@
 # -*- coding:utf-8 -*-
 import datetime
 import platform
+import getpass
 import re
 import time
 from functools import wraps
@@ -189,7 +190,12 @@ class MysqlUpload:
         2. json 文件中没有或者缺失部分列信息(利用 convert_dtype_to_sql 函数按指定规则转换缺失列)
         """
         cols = df.columns.tolist()
-        path = '/Users/xigua/数据中心/自动0备份/py/数据更新/support'
+        if platform.system() == 'Darwin':
+            path = os.path.join('/Users', getpass.getuser(), '数据中心/自动0备份/py/数据更新/support')
+        elif platform.system() == 'Windows':
+            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')
         # if os.path.isfile(json_file):
         d = data_types.DataTypes()

{mdbq-0.2.9 → mdbq-0.3.1}/mdbq.egg-info/PKG-INFO

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

{mdbq-0.2.9 → mdbq-0.3.1}/setup.py

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