hk-cdp 1.0.78__py3-none-any.whl → 1.0.80__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-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/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/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/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.dist-info → hk_cdp-1.0.80.dist-info}/METADATA

@@ -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.dist-info → hk_cdp-1.0.80.dist-info}/RECORD

@@ -3,8 +3,8 @@ 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=9ymMjP1BZ7ltPPgs_HejpOza9ZdtZwVxMI1t_K9DGzI,23463
-hk_cdp/libs/customize/cdp_helper.py,sha256=0guW-9q95wOm1arhj_lhDoS2iy6BhhMFUy-Q3R1g470,11505
+hk_cdp/libs/customize/asset_base_model.py,sha256=EWAXOzXIvyJOHJEz1prfD_9a-UjpACG9UEQ2tJGIHDw,23594
+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
 hk_cdp/libs/customize/work_base_model.py,sha256=ML_ayAR1AMMv8MTIGbS1jSZCvbbFXSEG59FkdXbT3cM,1854
@@ -21,12 +21,12 @@ hk_cdp/models/db_models/cdp/__init__.py,sha256=8AyJZ9QNMMgbxCoroCPpckaYWST0whyfa
 hk_cdp/models/db_models/cdp/cdp_store_info_model.py,sha256=HJlS7wnbFaJLXoZj_enri5OZkwxM_0bdpRHFjQ97bUU,2743
 hk_cdp/models/db_models/cdp/cdp_work_info_model.py,sha256=Fg9jyzGjqHAd974BywgQ4iH8KR-Cf9fCxo-4BE0dVGM,3749
 hk_cdp/models/db_models/member/__init__.py,sha256=848n8bTcWDnFiqDnucKrEMskbXJMLz29ju6s6ta2bR4,311
-hk_cdp/models/db_models/member/member_asset_log_model.py,sha256=HCYUpggBTCBED6-T_9F_s_dIREzSNrTUOMg9wht1Gjo,2963
+hk_cdp/models/db_models/member/member_asset_log_model.py,sha256=ew6kKgFsb0sQoQB-XkkRfA6S37CJwX6Ae3r58SH0bNg,3031
 hk_cdp/models/db_models/member/member_asset_model.py,sha256=AhbJ_2WvaTBEoLN-7QUKEcaRYNn4nbWRrR0FBahKD_E,2037
 hk_cdp/models/db_models/member/member_asset_valid_model.py,sha256=-bFlM6Xwh7dZg5eRqPahdi_wGWI1_5dEzwel2LfUJnM,1634
 hk_cdp/models/db_models/member/member_event_model.py,sha256=DciKs1uQ5G4rH1Kd-fcQqNLZzRsUUvtoxTy3MNlLJfg,1575
 hk_cdp/models/db_models/member/member_info_model.py,sha256=GDEwZmtocPseB2Blht4g_ftQBVNUmJbyLYpQow4tvZU,3122
-hk_cdp/models/db_models/member/member_level_log_model.py,sha256=i9HgZKxRBufBaJw4fpu1ZOpSH5SkVj-DGRFFbUkmH-Y,2353
+hk_cdp/models/db_models/member/member_level_log_model.py,sha256=Cj3y0ihgS-F2Zmb5JYlDIeNxkIxrtavqG_RbWUR0tsI,2421
 hk_cdp/models/db_models/prefix/__init__.py,sha256=EVHAkNcWIFBqGvVLFdf7PkUquZgumIjvhgMCzst5Bzw,188
 hk_cdp/models/db_models/prefix/prefix_info_model.py,sha256=FgiHeckslzD4l-BVP2Uv5gR8PL9mYRTbuzpmqFeyn1o,1292
 hk_cdp/models/db_models/queue/__init__.py,sha256=VkOyr0Oo5IRonER143sZClMfGuK6euH6ywkO_8F24EE,35
@@ -64,8 +64,8 @@ hk_cdp/models/db_models/user/__init__.py,sha256=O_F1_TiR_075ATAHcahxTKJwUdYeY-Qz
 hk_cdp/models/db_models/user/user_data_model.py,sha256=_0PbEsUf5e2JY2PL3LLj09cGAtAmS0dhnJnLCDNdkNc,2696
 hk_cdp/models/db_models/user/user_info_model.py,sha256=60Rwfn-N-M3zpp1zipxyXrHDyftkTU5J3lhIrAiFavY,4104
 hk_cdp/models/db_models/user/user_trends_model.py,sha256=CjlIbFFkTdTGIHYQ-cHkg9xUz92QC-sxmMBGPzcUvc4,1544
-hk_cdp-1.0.78.dist-info/LICENSE,sha256=hKHSuDoDoyOk6vOrpkYnOXZ640PvhUa-BTQbRRtFsUk,1061
-hk_cdp-1.0.78.dist-info/METADATA,sha256=q6OdXozrdltRTJWmouygE47fF5lk5t7rMSReHv-ZAz0,7101
-hk_cdp-1.0.78.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-hk_cdp-1.0.78.dist-info/top_level.txt,sha256=omzIr_m5qnzhfcdscOVr4P4JUB49wlP6KztqvlqDntw,7
-hk_cdp-1.0.78.dist-info/RECORD,,
+hk_cdp-1.0.80.dist-info/LICENSE,sha256=hKHSuDoDoyOk6vOrpkYnOXZ640PvhUa-BTQbRRtFsUk,1061
+hk_cdp-1.0.80.dist-info/METADATA,sha256=b14avdQcN1WmHX7kajCJuv9SFdczFXvVGD8o80FzZSc,7101
+hk_cdp-1.0.80.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+hk_cdp-1.0.80.dist-info/top_level.txt,sha256=omzIr_m5qnzhfcdscOVr4P4JUB49wlP6KztqvlqDntw,7
+hk_cdp-1.0.80.dist-info/RECORD,,