mdbq 1.5.8__tar.gz → 1.5.9__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {mdbq-1.5.8 → mdbq-1.5.9}/PKG-INFO +1 -1
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/aggregation/query_data.py +3 -1
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq.egg-info/PKG-INFO +1 -1
- {mdbq-1.5.8 → mdbq-1.5.9}/setup.py +1 -1
- {mdbq-1.5.8 → mdbq-1.5.9}/README.txt +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/__init__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/__version__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/aggregation/__init__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/aggregation/aggregation.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/aggregation/df_types.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/aggregation/mysql_types.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/aggregation/optimize_data.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/bdup/__init__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/bdup/bdup.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/clean/__init__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/clean/data_clean.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/company/__init__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/company/copysh.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/config/__init__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/config/get_myconf.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/config/products.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/config/set_support.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/config/update_conf.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/dataframe/__init__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/dataframe/converter.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/log/__init__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/log/mylogger.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/mongo/__init__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/mongo/mongo.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/mysql/__init__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/mysql/mysql.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/mysql/s_query.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/mysql/year_month_day.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/other/__init__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/other/porxy.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/other/pov_city.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/other/ua_sj.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/pbix/__init__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/pbix/pbix_refresh.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/pbix/refresh_all.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq/spider/__init__.py +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq.egg-info/SOURCES.txt +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq.egg-info/dependency_links.txt +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/mdbq.egg-info/top_level.txt +0 -0
- {mdbq-1.5.8 → mdbq-1.5.9}/setup.cfg +0 -0
|
@@ -723,6 +723,8 @@ class GroupBy:
|
|
|
723
723
|
cost = self.data_tgyj['商品成本']
|
|
724
724
|
df = pd.merge(sku_sales, cost, how='left', left_on='货号', right_on='款号')
|
|
725
725
|
df = df[['日期', '商品id', '货号', '成交单量', '成交金额', '成本价']]
|
|
726
|
+
df['商品id'] = df['商品id'].astype(str)
|
|
727
|
+
jdtg['跟单sku id'] = jdtg['跟单sku id'].astype(str)
|
|
726
728
|
if jd_tg is True:
|
|
727
729
|
# 完整的数据表，包含全店所有推广、销售数据
|
|
728
730
|
df = pd.merge(df, jdtg, how='left', left_on=['日期', '商品id'], right_on=['日期', '跟单sku id']) # df 合并推广表
|
|
@@ -1000,7 +1002,7 @@ def data_aggregation(service_databases=[{}], months=1):
|
|
|
1000
1002
|
|
|
1001
1003
|
|
|
1002
1004
|
if __name__ == '__main__':
|
|
1003
|
-
data_aggregation(service_databases=[{'
|
|
1005
|
+
data_aggregation(service_databases=[{'home_lx': 'mysql'}], months=1) # 正常的聚合所有数据
|
|
1004
1006
|
# data_aggregation_one(service_databases=[{'company': 'mysql'}], months=1) # 单独聚合某一个数据库，具体库进函数编辑
|
|
1005
1007
|
# optimize_data.op_data(service_databases=[{'company': 'mysql'}], days=3650) # 立即启动对聚合数据的清理工作
|
|
1006
1008
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|