hk-cdp 1.0.78__tar.gz → 1.0.80__tar.gz

{hk_cdp-1.0.78 → hk_cdp-1.0.80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hk_cdp
-Version: 1.0.78
+Version: 1.0.80
 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.78 → hk_cdp-1.0.80}/hk_cdp/libs/customize/asset_base_model.py

@@ -2,7 +2,7 @@
 """
 :Author: HuangJianYi
 :Date: 2020-05-12 20:11:48
-@LastEditTime: 2025-02-21 11:32:36
+@LastEditTime: 2025-05-29 16:22:19
 @LastEditors: HuangJianYi
 :description: 
 """
@@ -89,7 +89,8 @@ class AssetBaseModel():
                           remark='',
                           operate_user_id='',
                           operate_user_name='',
-                          valid_end_date=None):
+                          valid_end_date=None,
+                          scheme_id=0):
         """
         :description: 变更资产
         :param business_id：商家标识
@@ -109,13 +110,14 @@ class AssetBaseModel():
         :param operate_user_id:操作用户标识
         :param operate_user_name:操作用户名称
         :param valid_end_date：有效期结束时间（时间格式，不传或默认时间，则表示永久有效）
+        :param scheme_id：体系标识
         :return: 返回实体InvokeResultData
         :last_editors: HuangJianYi
         """
 
         invoke_result_data = InvokeResultData()
 
-        if not one_id or not asset_type or not asset_value:
+        if not one_id or not asset_type or not asset_value or not scheme_id:
             invoke_result_data.success = False
             invoke_result_data.error_code = "param_error"
             invoke_result_data.error_message = "参数不能为空或等于0"
@@ -187,6 +189,7 @@ class AssetBaseModel():
 
             member_asset_log = MemberAssetLog()
             member_asset_log.business_id = business_id
+            member_asset_log.scheme_id = scheme_id
             member_asset_log.change_no = SevenHelper.create_order_id()  # 18位随机
             member_asset_log.one_id = one_id
             member_asset_log.user_id = user_id
@@ -212,7 +215,7 @@ class AssetBaseModel():
             else:
                 member_asset_log.valid_type = 1
             member_asset_log.create_date = now_datetime
-            
+
 
             # 开始事务
             db_transaction.begin_transaction()
@@ -362,7 +365,7 @@ class AssetBaseModel():
             params.append(end_date)
         if business_type != -1:
             condition_where.add_condition("business_type=%s")
-            params.append(business_type)    
+            params.append(business_type)
         if source_type:
             if type(source_type) == str:
                 condition_where.add_condition(SevenHelper.get_condition_by_int_list("source_type", [int(item) for item in source_type.split(",")]))

{hk_cdp-1.0.78 → hk_cdp-1.0.80}/hk_cdp/libs/customize/cdp_helper.py

@@ -2,7 +2,7 @@
 """
 @Author: HuangJianYi
 @Date: 2024-11-18 18:57:33
-@LastEditTime: 2025-04-25 18:11:19
+@LastEditTime: 2025-05-27 15:23:13
 @LastEditors: HuangJianYi
 @Description: 帮助类
 """
@@ -13,7 +13,18 @@ from seven_cloudapp_frame.libs.customize.seven_helper import *
 from seven_cloudapp_frame.libs.customize.safe_helper import *
 from hk_cdp.models.enum import *
 
+
 class CdpHelper:
+    
+    @classmethod
+    def decrypt_cdp_db_config(self, cdp_db_config):
+        """
+        :description: 获取对应的数据库名
+        :param business_code: 商家代码
+        :param cdp_db_config: 数据库连接串
+        :last_editors: HuangJianYi
+        """
+        return cdp_db_config
 
     @classmethod
     def get_business_db(self, business_code, cdp_db_config):

{hk_cdp-1.0.78 → hk_cdp-1.0.80}/hk_cdp/models/db_models/member/member_asset_log_model.py

@@ -27,6 +27,7 @@ class MemberAssetLog:
         super(MemberAssetLog, self).__init__()
         self.id = 0
         self.business_id = 0  # 商家标识
+        self.scheme_id = 0 # 体系标识
         self.change_no = ""  # 变更流水号
         self.one_id = ""  # one_id
         self.user_id = ""  # 客户ID
@@ -53,7 +54,8 @@ class MemberAssetLog:
     @classmethod
     def get_field_list(self):
         return [
-            'id', 'business_id', 'change_no', 'one_id', 'user_id', 'log_title', 'asset_type', 'asset_object_id', 'store_id', 'business_type', 'source_type', 'source_object_id', 'source_object_name', 'operate_type', 'operate_value', 'surplus_value', 'history_value', 'processed_price', 'valid_type', 'valid_end_date', 'remark', 'operate_user_id', 'operate_user_name', 'create_date'
+            'id', 'business_id', 'scheme_id', 'change_no', 'one_id', 'user_id', 'log_title', 'asset_type', 'asset_object_id', 'store_id', 'business_type', 'source_type', 'source_object_id', 'source_object_name', 'operate_type', 'operate_value', 'surplus_value', 'history_value',
+            'processed_price', 'valid_type', 'valid_end_date', 'remark', 'operate_user_id', 'operate_user_name', 'create_date'
         ]
 
     @classmethod
@@ -61,4 +63,4 @@ class MemberAssetLog:
         return "id"
 
     def __str__(self):
-        return "member_asset_log_tb"
+        return "member_asset_log_tb"

{hk_cdp-1.0.78 → hk_cdp-1.0.80}/hk_cdp/models/db_models/member/member_level_log_model.py

@@ -27,6 +27,7 @@ class MemberLevelLog:
         super(MemberLevelLog, self).__init__()
         self.id = 0
         self.business_id = 0  # 商家标识
+        self.scheme_id = 0 # 体系标识
         self.change_no = ""  # 变更流水号
         self.one_id = ""  # one_id
         self.log_title = ""  # 标题
@@ -46,7 +47,8 @@ class MemberLevelLog:
     @classmethod
     def get_field_list(self):
         return [
-            'id', 'business_id', 'change_no', 'one_id', 'log_title', 'source_type', 'source_object_id', 'source_object_name', 'operate_type', 'old_level_id', 'new_level_id', 'valid_type', 'level_valid_date', 'remark', 'operate_user_id', 'operate_user_name', 'create_date'
+            'id', 'business_id', 'scheme_id', 'change_no', 'one_id', 'log_title', 'source_type', 'source_object_id', 'source_object_name', 'operate_type', 'old_level_id', 'new_level_id', 'valid_type', 'level_valid_date', 'remark', 'operate_user_id', 'operate_user_name',
+            'create_date'
         ]
 
     @classmethod
@@ -54,4 +56,4 @@ class MemberLevelLog:
         return "id"
 
     def __str__(self):
-        return "member_level_log_tb"
+        return "member_level_log_tb"

{hk_cdp-1.0.78 → hk_cdp-1.0.80}/hk_cdp.egg-info/PKG-INFO

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

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