mdbq 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

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.
Files changed (5) hide show
  1. mdbq/aggregation/query_data.py +1 -1
  2. {mdbq-0.3.2.dist-info → mdbq-0.3.4.dist-info}/METADATA +1 -1
  3. {mdbq-0.3.2.dist-info → mdbq-0.3.4.dist-info}/RECORD +5 -5
  4. {mdbq-0.3.2.dist-info → mdbq-0.3.4.dist-info}/WHEEL +0 -0
  5. {mdbq-0.3.2.dist-info → mdbq-0.3.4.dist-info}/top_level.txt +0 -0
mdbq/aggregation/query_data.py CHANGED
@@ -372,7 +372,7 @@ class GroupBy:
372
372
  df.drop_duplicates(subset=['日期', '商品id', '花费', '销售额'], keep='last', inplace=True, ignore_index=True)
373
373
  df['商品成本'] = df.apply(lambda x: x['成本价'] + x['销售额']/x['销售量'] * 0.11 + 6 if x['销售量'] > 0 else 0, axis=1)
374
374
  df['商品毛利'] = df.apply(lambda x: x['销售额'] - x['商品成本'] * x['销售量'], axis=1)
375
- df['毛利率'] = df.apply(lambda x: round(x['销售额'] - x['商品成本'] / x['销售额'], 4) if x['销售量'] > 0 else 0, axis=1)
375
+ df['毛利率'] = df.apply(lambda x: round((x['销售额'] - x['商品成本']) / x['销售额'], 4) if x['销售额'] > 0 else 0, axis=1)
376
376
  df['盈亏'] = df.apply(lambda x: x['商品毛利'] - x['花费'], axis=1)
377
377
  return df
378
378
 
{mdbq-0.3.2.dist-info → mdbq-0.3.4.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: mdbq
3
- Version: 0.3.2
3
+ Version: 0.3.4
4
4
  Home-page: https://pypi.org/project/mdbsql
5
5
  Author: xigua,
6
6
  Author-email: 2587125111@qq.com
{mdbq-0.3.2.dist-info → mdbq-0.3.4.dist-info}/RECORD RENAMED
@@ -3,7 +3,7 @@ mdbq/__version__.py,sha256=y9Mp_8x0BCZSHsdLT_q5tX9wZwd5QgqrSIENLrb6vXA,62
3
3
  mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
4
4
  mdbq/aggregation/aggregation.py,sha256=TkxyIBowTuoNrhVkrgnYNXwNQXCX_xjh7wcYXdP65-E,58496
5
5
  mdbq/aggregation/optimize_data.py,sha256=jLAWtxPUuhpo4XTVrhKtT4xK3grs7r73ePQfLhxlu1I,779
6
- mdbq/aggregation/query_data.py,sha256=rMqIGNCpQ_7d2Fer5nUiyPO6sndaraT8gbZBZxddmqI,23496
6
+ mdbq/aggregation/query_data.py,sha256=0Wo8AKHOuJ2m8wqmpQJSBJjD7s_7eL6Ou5lZjxfbR0g,23498
7
7
  mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
8
8
  mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
9
9
  mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
@@ -33,7 +33,7 @@ mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
33
33
  mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
34
34
  mdbq/pbix/refresh_all.py,sha256=wulHs4rivf4Mi0Pii2QR5Nk9-TBcvSwnCB_WH9QULKE,5939
35
35
  mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
36
- mdbq-0.3.2.dist-info/METADATA,sha256=ITyOng2qYLCR4RJMJqajBQsMuWdqTtWNeIQf8iJ06Y4,245
37
- mdbq-0.3.2.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
38
- mdbq-0.3.2.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
39
- mdbq-0.3.2.dist-info/RECORD,,
36
+ mdbq-0.3.4.dist-info/METADATA,sha256=1X2UtJWoF55a1DM5zI15bmKJ0-JC3-Vf0YSwHXIxuYE,245
37
+ mdbq-0.3.4.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
38
+ mdbq-0.3.4.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
39
+ mdbq-0.3.4.dist-info/RECORD,,
{mdbq-0.3.2.dist-info → mdbq-0.3.4.dist-info}/WHEEL RENAMED
File without changes