hk-cdp 1.0.105__py3-none-any.whl → 1.0.107__py3-none-any.whl

hk_cdp/libs/customize/asset_base_model.py

@@ -2,7 +2,7 @@
 """
 :Author: HuangJianYi
 :Date: 2020-05-12 20:11:48
-@LastEditTime: 2025-07-24 21:51:42
+@LastEditTime: 2025-08-05 15:53:24
 @LastEditors: HuangJianYi
 :description: 
 """
@@ -215,9 +215,26 @@ class AssetBaseModel():
                 member_asset_log.valid_type = 1
             member_asset_log.create_date = now_datetime
 
+            update_asset_log_list = []
+            if operate_type in [1, 3]: # 只有消费和作废需要，更新剩余值
+                asset_log_list = member_asset_log_model.get_list(where="one_id=%s AND asset_type=1 AND operate_type=0 AND surplus_value>0", params=[one_id], order_by="valid_end_date ASC,create_date ASC")
+                operate_value = asset_value
+                for asset_log in asset_log_list:
+                    if asset_log.surplus_value >= operate_value:
+                        asset_log.history_value = asset_log.surplus_value  # 历史值为当前剩余值
+                        asset_log.surplus_value -= operate_value  # 剩余值减少
+                        update_asset_log_list.append(asset_log)
+                        break
+                    else:
+                        asset_log.history_value = asset_log.surplus_value  # 历史值为当前剩余值
+                        operate_value -= asset_log.surplus_value  # 操作值减少
+                        asset_log.surplus_value = 0  # 剩余值为0
+                        update_asset_log_list.append(asset_log)
 
             # 开始事务
             db_transaction.begin_transaction()
+            if update_asset_log_list:
+                member_asset_log_model.update_list(update_asset_log_list, field_list='history_value,surplus_value')
 
             if old_user_asset_id != 0:
                 member_asset_model.update_entity(member_asset, "asset_value,asset_check_code,modify_date,total_incr_value,total_decr_value")

hk_cdp/models/db_models/tt/tt_source_history_member_model.py

@@ -29,7 +29,7 @@ class TtSourceHistoryMember:
         self.union_id = "" # union_id
         self.store_id = ""  # 店铺id
         self.current_points = ""  # 积分余额
-        self.level = 0  # 等级
+        self.level_id = 0  # 等级
         self.mobile = ""  # 明文手机号
         self.mask_mobile = ""  # 掩码手机号
         self.apply_time = '1900-01-01 00:00:00.000'  # 入会时间
@@ -41,7 +41,7 @@ class TtSourceHistoryMember:
     @classmethod
     def get_field_list(self):
         return [
-            'doudian_open_id', 'union_id', 'store_id', 'current_points', 'level', 'mobile', 'mask_mobile',
+            'doudian_open_id', 'union_id', 'store_id', 'current_points', 'level_id', 'mobile', 'mask_mobile',
             'apply_time', 'order_total_amount', 'order_count', 'modify_time', 'create_time'
         ]
 

{hk_cdp-1.0.105.dist-info → hk_cdp-1.0.107.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hk-cdp
-Version: 1.0.105
+Version: 1.0.107
 Summary: hk cdp
 Home-page: http://gitlab.tdtech.gao7.com/newfire/hk_cap/hk_cdp/server/hk_cdp.git
 Author: seven

{hk_cdp-1.0.105.dist-info → hk_cdp-1.0.107.dist-info}/RECORD

@@ -3,7 +3,7 @@ hk_cdp/handler/__init__.py,sha256=iwhKnzeBJLKxpRVjvzwiRE63_zNpIBfaKLITauVph-0,24
 hk_cdp/handler/cdp_base.py,sha256=CgLnJPuxRzpfIZvxk9-7Tu1qfcsFm-xKLYkOaWw9gp0,2605
 hk_cdp/libs/__init__.py,sha256=iwhKnzeBJLKxpRVjvzwiRE63_zNpIBfaKLITauVph-0,24
 hk_cdp/libs/customize/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hk_cdp/libs/customize/asset_base_model.py,sha256=qejT8iZhTTIyCB2GR9jEizVYpGBMfkehlGEv2DGzUx0,23589
+hk_cdp/libs/customize/asset_base_model.py,sha256=eRExBgVfURH2YYElDCEJwarhG0yAw0aLGyuZZTqYiaI,24862
 hk_cdp/libs/customize/cdp_helper.py,sha256=st4NOYbFBT4WIOJ3j7bcAyml503z2ayiU78hbrNisGM,11810
 hk_cdp/libs/customize/rainbow_helper.py,sha256=M9gb3MyHf8SHGtX27GC8llivvAZxV_fb1CqJK_crfZ4,2372
 hk_cdp/libs/customize/tiktok_spi_helper.py,sha256=CBzZOZlwcJdI22HOewIPTvAPWOHYdyvq7OAZhijTlFA,3575
@@ -61,13 +61,13 @@ hk_cdp/models/db_models/tt/tt_rds_item_model.py,sha256=WCgZIo1lBgR1VWfS-8SALXWcI
 hk_cdp/models/db_models/tt/tt_rds_refund_model.py,sha256=y51lwWDHHLIrNw-YjIKTm3EuS3PbWcIl-ZE_S9LYCBE,1987
 hk_cdp/models/db_models/tt/tt_rds_trade_model.py,sha256=BBc0uHI7VDRWRcCGZHniWtkk3-ToDr6hKGhQwEiryvY,1948
 hk_cdp/models/db_models/tt/tt_source_buyer_model.py,sha256=xftM1m2DMIQVyw6y1vJgNlVqqL63k8iMgdLpg5GiI9w,1779
-hk_cdp/models/db_models/tt/tt_source_history_member_model.py,sha256=jMw8QqyG84rx0Jdtg7RHwYaNxz_ylLA0UjkhvGsqzAc,2080
+hk_cdp/models/db_models/tt/tt_source_history_member_model.py,sha256=Z7DeqNWTfnGEMvaa2WGJhc4hZ-r6PzfTUsqgjswWf6A,2086
 hk_cdp/models/db_models/user/__init__.py,sha256=O_F1_TiR_075ATAHcahxTKJwUdYeY-QzJqzO0EbsaCM,68
 hk_cdp/models/db_models/user/user_data_model.py,sha256=hswh3ELJtBilEgzr7W6MfmaWsnSr93oO0nizbbPeRAk,2757
 hk_cdp/models/db_models/user/user_info_model.py,sha256=TywpvlFGkch9hO_szyhin-ed4xfTWBM7L59IU96SfxU,4138
 hk_cdp/models/db_models/user/user_trends_model.py,sha256=oxJCBnJQEvFr1_heV_cxRrPIic6_oSoLqARc6ldp2LM,1592
-hk_cdp-1.0.105.dist-info/LICENSE,sha256=hKHSuDoDoyOk6vOrpkYnOXZ640PvhUa-BTQbRRtFsUk,1061
-hk_cdp-1.0.105.dist-info/METADATA,sha256=RGL3rqEPepou2gduDNQyHbLH97xUtDfsEIbieoKCFS0,7102
-hk_cdp-1.0.105.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-hk_cdp-1.0.105.dist-info/top_level.txt,sha256=omzIr_m5qnzhfcdscOVr4P4JUB49wlP6KztqvlqDntw,7
-hk_cdp-1.0.105.dist-info/RECORD,,
+hk_cdp-1.0.107.dist-info/LICENSE,sha256=hKHSuDoDoyOk6vOrpkYnOXZ640PvhUa-BTQbRRtFsUk,1061
+hk_cdp-1.0.107.dist-info/METADATA,sha256=9b-C1SesIfXAtGNPo2D92W-9rhdnUI-uDxVgm2Mza7A,7102
+hk_cdp-1.0.107.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+hk_cdp-1.0.107.dist-info/top_level.txt,sha256=omzIr_m5qnzhfcdscOVr4P4JUB49wlP6KztqvlqDntw,7
+hk_cdp-1.0.107.dist-info/RECORD,,