hk-cdp 1.0.77__tar.gz → 1.0.79__tar.gz

{hk_cdp-1.0.77 → hk_cdp-1.0.79}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hk_cdp
-Version: 1.0.77
+Version: 1.0.79
 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.77 → hk_cdp-1.0.79}/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.77 → hk_cdp-1.0.79}/hk_cdp/models/db_models/cdp/cdp_work_info_model.py

@@ -22,39 +22,42 @@ class CdpWorkInfoModel(CacheModel):
 
     # 方法扩展请继承此类
 
-    def start_work(self, store_id, work_name, progress_type=0, dependency_key=''):
+    def start_work(self, store_id, work_name, progress_type=0, dependency_key='', scheme_id=0):
         """
         开始作业
         :param store_id: 店铺标识
         :param work_name: 作业名称
         :param progress_type: 当前进度值
         :param dependency_key: 依赖建
+        :param scheme_id: 体系标识
         :return: 
         """
         if progress_type == 0:
-            self.update_table("run_start_date=%s,progress_type=1", "store_id=%s and work_name=%s", params=[TimeHelper.get_now_format_time(), store_id, work_name])
+            self.update_table("run_start_date=%s,progress_type=1", "scheme_id=%s and store_id=%s and work_name=%s", params=[TimeHelper.get_now_format_time(), scheme_id, store_id, work_name])
             self.delete_dependency_key(dependency_key)
 
-    def end_work(self, store_id, work_name, run_desc='处理结束', dependency_key=''):
+    def end_work(self, store_id, work_name, run_desc='处理结束', dependency_key='', scheme_id=0):
         """
         结束作业
         :param store_id: 店铺标识
         :param work_name: 作业名称
         :param run_desc: 运行描述
         :param dependency_key: 依赖建
+        :param scheme_id: 体系标识
         :return: 
         """
-        self.update_table("run_desc=%s,run_end_date=%s,progress_type=2", "store_id=%s and work_name=%s", params=[run_desc, TimeHelper.get_now_format_time(), store_id, work_name])
+        self.update_table("run_desc=%s,run_end_date=%s,progress_type=2", "scheme_id=%s and store_id=%s and work_name=%s", params=[run_desc, TimeHelper.get_now_format_time(), scheme_id, store_id, work_name])
         self.delete_dependency_key(dependency_key)
 
-    def run_work(self, store_id, work_name):
+    def run_work(self, store_id, work_name, scheme_id=0):
         """
         运行作业
         :param store_id: 店铺标识
         :param work_name: 作业名称
+        :param scheme_id: 体系标识
         :return: 
         """
-        return self.update_table("run_last_date=%s", "store_id=%s and work_name=%s", params=[TimeHelper.get_now_format_time(), store_id, work_name])
+        return self.update_table("run_last_date=%s", "scheme_id=%s and store_id=%s and work_name=%s", params=[TimeHelper.get_now_format_time(), scheme_id, store_id, work_name])
 
 
 class CdpWorkInfo:

{hk_cdp-1.0.77 → hk_cdp-1.0.79}/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.77 → hk_cdp-1.0.79}/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.77 → hk_cdp-1.0.79}/hk_cdp.egg-info/PKG-INFO

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

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