hk-cdp 1.0.104__tar.gz → 1.0.106__tar.gz

{hk_cdp-1.0.104 → hk_cdp-1.0.106}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hk_cdp
-Version: 1.0.104
+Version: 1.0.106
 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.104 → hk_cdp-1.0.106}/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-1.0.104 → hk_cdp-1.0.106}/hk_cdp/libs/customize/work_base_model.py

@@ -8,11 +8,12 @@ class WorkBaseModel():
     :description: 队列作业日志业务模型
     """
 
-    def __init__(self, context=None, logging_error=None, logging_info=None, db_config_dict=None):
+    def __init__(self, context=None, logging_error=None, logging_info=None, db_config_dict=None, sub_table=None):
         self.context = context
         self.logging_link_error = logging_error
         self.logging_link_info = logging_info
         self.db_config_dict = db_config_dict
+        self.sub_table = sub_table
 
     def add_queue_work_log(self, log_id, queue_name, queue_value, is_success=1, result_info='执行成功'):
         """
@@ -26,7 +27,7 @@ class WorkBaseModel():
         :last_editors: HuangJianYi
         """
         try:
-            queue_work_log_model = QueueWorkLogModel(db_config_dict=self.db_config_dict, context=self.context)
+            queue_work_log_model = QueueWorkLogModel(db_config_dict=self.db_config_dict, sub_table=self.sub_table, context=self.context)
             queue_work_log = QueueWorkLog()
             queue_work_log.log_id = log_id
             queue_work_log.queue_name = queue_name

{hk_cdp-1.0.104 → hk_cdp-1.0.106}/hk_cdp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hk-cdp
-Version: 1.0.104
+Version: 1.0.106
 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.104 → hk_cdp-1.0.106}/setup.py

@@ -14,7 +14,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
 
 setup(
     name="hk_cdp",
-    version="1.0.104",
+    version="1.0.106",
     author="seven",
     author_email="tech@gao7.com",
     description="hk cdp",