mdbq 0.2.9__py3-none-any.whl → 0.3.1__py3-none-any.whl

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/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.dist-info → mdbq-0.3.1.dist-info}/METADATA

@@ -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.dist-info → mdbq-0.3.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=yxNFUOHo5I4f1cdSqRCR27wft93QhQLjszPhxa69das,23377
+mdbq/aggregation/query_data.py,sha256=5fhwx6PzZs84XARCcWwWMWfGXWYIsdvo28oY4FfKOdY,23467
 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
@@ -22,7 +22,7 @@ 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=BNKICpMCFskg8Zk8iR1tmDmOTvtNbOf8_lORPgHBdWs,33570
+mdbq/mysql/mysql.py,sha256=42IJOAWiSoic4m_u3_875F2IzKHIW-2dNWx7OYZ0Ub4,33901
 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=wulHs4rivf4Mi0Pii2QR5Nk9-TBcvSwnCB_WH9QULKE,5939
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-0.2.9.dist-info/METADATA,sha256=vJRSABhC22k9TVgiTQhVbWpgqJXMcKRGimlIZo_ig5k,245
-mdbq-0.2.9.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-0.2.9.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-0.2.9.dist-info/RECORD,,
+mdbq-0.3.1.dist-info/METADATA,sha256=tEIM2edotzvBE_kqq_RXaV7rMr32B5erNjTCkFiCTsI,245
+mdbq-0.3.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-0.3.1.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-0.3.1.dist-info/RECORD,,