mdbq 4.0.49__py3-none-any.whl → 4.0.51__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.49'
+VERSION = '4.0.51'

mdbq/aggregation/query_data.py

@@ -244,8 +244,8 @@ class MysqlDatasQuery:
         df_real_sales = self._get_real_sales(shop_list=shop_list)
         df_shop_gmv = self._get_shop_gmv(shop_list=shop_list)
         df_tg_data = self._get_tg_data(shop_list=shop_list)
-        df = df_shop_gmv.merge(df_real_sales, on=['日期', '店铺名称'], how='left')
-        df = df.merge(df_tg_data, on=['日期', '店铺名称'], how='left')
+        df = df_shop_gmv.merge(df_real_sales, on=['日期', '店铺名称'], how='outer')  # 平台数据合并销售数据
+        df = df.merge(df_tg_data, on=['日期', '店铺名称'], how='outer')  # 合并推广数据
         df.fillna(0, inplace=True)
         set_typ = SET_TYP_DICT[f'{db_name}_{table_name}']
         return df, {
@@ -266,7 +266,7 @@ class MysqlDatasQuery:
     
     def _get_tg_data(self, db_name='聚合数据', table_name='多店推广场景_按日聚合', shop_list:dict=None):
         start_date, end_date = self.months_data(num=self.months)
-        projection = ['日期', '店铺名称', '营销场景', '花费', '成交金额']
+        projection = ['日期', '店铺名称', '营销场景', '花费']
         df = self.download_manager.data_to_df(
             db_name=db_name,
             table_name=table_name,
@@ -275,14 +275,13 @@ class MysqlDatasQuery:
             projection=projection,
         )
         if df.empty:
-            return pd.DataFrame(columns=['日期', '店铺名称', '实际消耗', '推广成交金额'])
+            return pd.DataFrame(columns=['日期', '店铺名称', '实际消耗'])
         df = df[(df['店铺名称'].isin(shop_list.keys()))]
         df = df.astype({
             '日期': 'datetime64[ns]',
             '花费': 'float64',
-            '成交金额': 'float64'
         })
-        df = df.groupby(['日期', '店铺名称'], as_index=False).agg({'花费': 'sum', '成交金额': 'sum'}).rename(columns={'花费': '实际消耗', '成交金额': '推广成交金额'})
+        df = df.groupby(['日期', '店铺名称'], as_index=False).agg({'花费': 'sum'}).rename(columns={'花费': '实际消耗'})
         df['店铺名称'] = df['店铺名称'].map(shop_list)
         return df
 
@@ -351,8 +350,33 @@ class MysqlDatasQuery:
                     }).rename(
                         columns={'商店名称': '店铺名称', '验收日期': '日期', '金额': '实际营收'}
                         )
+        df_ziying_sales = self._get_ziying_sales(shop_list=shop_list)
+        df = pd.concat([df, df_ziying_sales], ignore_index=True)  # e3 合并京东自营业绩
         return df
 
+    def _get_ziying_sales(self, db_name='京东数据3', table_name='京东自营_vc品牌业绩', shop_list:dict=None):
+        """获取京东自营业绩"""
+        start_date, end_date = self.months_data(num=self.months)
+        projection = ['日期', '店铺名称', '收入']
+        df = self.download_manager.data_to_df(
+            db_name=db_name,
+            table_name=table_name,
+            start_date=start_date,
+            end_date=end_date,
+            projection=projection,
+        )
+        if df.empty:
+            return pd.DataFrame(columns=['日期', '店铺名称', '收入'])
+        df = df[(df['店铺名称'].isin(shop_list.keys()))]
+        df = df.astype({
+            '日期': 'datetime64[ns]',
+            '收入': 'float64'
+        })
+        df = df.groupby(['日期', '店铺名称'], as_index=False).agg({'收入': 'sum'}).rename(columns={'收入': '实际营收'})
+        df['店铺名称'] = df['店铺名称'].map(shop_list)
+        return df
+
+    
     # @error_handler.log_on_exception(logger=logger)
     def tg_wxt(self, db_name='聚合数据', table_name='天猫_主体报表', is_maximize=True):
         start_date, end_date = self.months_data(num=self.months)
@@ -2655,7 +2679,7 @@ class MysqlDatasQuery:
         projection = {}
         df = self.download_manager.data_to_df(
             db_name='爱库存2',
-            table_name='spu榜单',
+            table_name='爱库存_spu榜单',
             start_date=start_date,
             end_date=end_date,
             projection=projection,
@@ -3323,7 +3347,7 @@ def query2(months=1, download_manager=None):
     sdq.tg_gjc(db_name='聚合数据', table_name='天猫_关键词报表')
     sdq.jd_gjc(db_name='聚合数据', table_name='京东_关键词报表')
     sdq.se_search(db_name='聚合数据', table_name='天猫店铺来源_手淘搜索')
-    sdq.aikucun_bd_spu(db_name='聚合数据', table_name='爱库存_商品spu榜单')
+    # sdq.aikucun_bd_spu(db_name='聚合数据', table_name='爱库存_商品spu榜单')
     sdq.dmp_crowd(db_name='聚合数据', table_name='达摩盘_人群报表')
     sdq.deeplink(db_name='聚合数据', table_name='达摩盘_deeplink人群洞察')
     sdq.global_insights(db_name='聚合数据', table_name='全域洞察')

mdbq/aggregation/set_typ_dict.py

@@ -573,12 +573,12 @@ SET_TYP_DICT = {
     '聚合数据_多店聚合_日报': {
         '日期': 'date',
         '店铺名称': 'varchar(255)',
+        '实际营收': 'decimal(12,2)',
+        '支付金额': 'decimal(12,2)',
         '访客数': 'int',
         '浏览量': 'int',
-        '支付金额': 'decimal(12,2)',
         '支付买家数': 'int',
         '支付件数': 'int',
-        '实际营收': 'decimal(12,2)',
         '实际消耗': 'decimal(10,2)',
         '推广成交金额': 'decimal(12,2)',
     },

mdbq/spider/aikucun.py

@@ -212,6 +212,7 @@ class AikuCun:
         """
         这里获取的数据等同于"查询"按钮的数据, 没有"营销后供货额/供货价" 这2个字段, 如果通过下载按钮的报表则有两个字段
         """
+        item_type = re.sub('爱库存_', '', item_type)
         if start_date:
             self.start_date = start_date
         if end_date:
@@ -480,7 +481,7 @@ class AikuCun:
         )
 
 
-def main(start_date, end_date=None, item_type=['spu']):
+def main(start_date, end_date=None, item_type=['爱库存_spu']):
     db_config = {
         'username': username,
         'password': password,
@@ -493,7 +494,7 @@ def main(start_date, end_date=None, item_type=['spu']):
             ak = AikuCun(uld_manager=uld, download_manager=download)
             # ak.get_sign()
             for type_ in item_type:
-                if type_ not in ['spu', 'sku']:
+                if type_ not in ['爱库存_spu', '爱库存_sku']:
                     logger.error(f'{item_type} 非法参数: {type_}')
                     continue
                 for i in range(2):
@@ -518,13 +519,12 @@ def main(start_date, end_date=None, item_type=['spu']):
                 )
 
 
-
 if __name__ == '__main__':
     main(
         start_date='2025-05-13',
         # end_date='2025-04-28',  # 不传则默认到今天
         item_type=[
-            'spu',
-            'sku'
+            '爱库存_spu',
+            '爱库存_sku'
         ]
     )

{mdbq-4.0.49.dist-info → mdbq-4.0.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mdbq
-Version: 4.0.49
+Version: 4.0.51
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-4.0.49.dist-info → mdbq-4.0.51.dist-info}/RECORD

@@ -1,8 +1,8 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=w0_qnEcOXc78a1VMuCkzhCyb88nMzAB5go-JLIBhX64,18
+mdbq/__version__.py,sha256=BM7d-S3JyI_exrIOENOPbUS0DmkGJNFKr_pNt9dvElM,18
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
-mdbq/aggregation/query_data.py,sha256=B6ibvZidou8u7RL5-9jWxufbLNiHD66n2-OtlbVFPqs,156119
-mdbq/aggregation/set_typ_dict.py,sha256=5qyagMloGAxlk3ORcmmgyWbEcc464vfE0kbrvCm-44k,21078
+mdbq/aggregation/query_data.py,sha256=83-CR2jFFrMJMwkuZm43Kn7P3mjTvjP6i4Av6eEudT8,157236
+mdbq/aggregation/set_typ_dict.py,sha256=Cax8i6My6xuTC8l-eB0AJ-kOZQwPRcZj-P9dhiiaTj0,21078
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=kPe3wsQNaB1slfX-Z7VMqzZoMoqPfc7ylYXZDBeFzzI,24945
 mdbq/myconf/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -25,8 +25,8 @@ mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=vpBuNc22uj9Vr-_Dh25_wpwWM1e-072EAAIBdB_IpL0,23494
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq/spider/aikucun.py,sha256=XptHjGzbout9IYzWAOQUpMMV5qEgLTU8pL1ZGt8oNEA,21868
-mdbq-4.0.49.dist-info/METADATA,sha256=D8fJ0YmRPlGs31kbXNfuDPE7-klblLbg2B_9ugGYfuQ,364
-mdbq-4.0.49.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-4.0.49.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.49.dist-info/RECORD,,
+mdbq/spider/aikucun.py,sha256=AR4_eT7TY_M5SyFfU0DvM8-InWf7jAu4jGnroMXk-Q0,21973
+mdbq-4.0.51.dist-info/METADATA,sha256=rGKL_Z4q25_RxubqDhYiUYZeU9p4Bsnsdan-_3m0hrM,364
+mdbq-4.0.51.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.0.51.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.51.dist-info/RECORD,,