hk-cdp 1.0.75__tar.gz → 1.0.76__tar.gz

{hk_cdp-1.0.75 → hk_cdp-1.0.76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hk_cdp
-Version: 1.0.75
+Version: 1.0.76
 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.75 → hk_cdp-1.0.76}/hk_cdp/libs/customize/cdp_helper.py

@@ -2,9 +2,9 @@
 """
 @Author: HuangJianYi
 @Date: 2024-11-18 18:57:33
-@LastEditTime: 2025-01-09 14:35:35
+@LastEditTime: 2025-04-25 18:11:19
 @LastEditors: HuangJianYi
-@Description: 
+@Description: 帮助类
 """
 import datetime
 import math
@@ -14,7 +14,7 @@ from seven_cloudapp_frame.libs.customize.safe_helper import *
 from hk_cdp.models.enum import *
 
 class CdpHelper:
-    
+
     @classmethod
     def get_business_db(self, business_code, cdp_db_config):
         """
@@ -41,8 +41,8 @@ class CdpHelper:
         cdp_db_config = SevenHelper.json_loads(cdp_db_config)
         cdp_db_config = deepcopy(cdp_db_config)
         cdp_db_config["db"] = f"hk_{business_code}_cdp"
-        return cdp_db_config  
-    
+        return cdp_db_config
+
     @classmethod
     def get_valid_date(self, valid_type, expire_type, expire_value, expire_year, expire_month, expire_day):
         """
@@ -70,6 +70,35 @@ class CdpHelper:
                 else:
                     raise Exception("过期年/过期月/过期日不能为空")
 
+    @classmethod
+    def get_valid_date_v2(self, scheme_level_dict, level_info_dict):
+        """
+        :description: 计算积分/成长值过期时间
+        :param scheme_level_dict: scheme_level_dict
+        :param level_info_dict: level_info_dict
+        :last_editors: HuangJianYi
+        """
+        valid_type = scheme_level_dict['valid_type'] if scheme_level_dict and scheme_level_dict['is_unify_valid'] == 1 else level_info_dict.get('valid_type', 0)
+        expire_type = scheme_level_dict['expire_type'] if scheme_level_dict and scheme_level_dict['is_unify_valid'] == 1 else level_info_dict.get('expire_type', 0)
+        expire_value = scheme_level_dict['expire_value'] if scheme_level_dict and scheme_level_dict['is_unify_valid'] == 1 else level_info_dict.get('expire_value', 0)
+        expire_year = scheme_level_dict['expire_year'] if scheme_level_dict and scheme_level_dict['is_unify_valid'] == 1 else level_info_dict.get('expire_year', None)
+        expire_month = scheme_level_dict['expire_month'] if scheme_level_dict and scheme_level_dict['is_unify_valid'] == 1 else level_info_dict.get('expire_month', None)
+        expire_day = scheme_level_dict['expire_day'] if scheme_level_dict and scheme_level_dict['is_unify_valid'] == 1 else level_info_dict.get('expire_day', None)
+        if valid_type == ValidType.forever.value:
+            return '2900-01-01 00:00:00'
+        else:
+            if expire_type is None:
+                raise Exception("过期类型不能为空")
+            if expire_type == ExpireType.appoint_day.value: # 指定天过期
+                return (datetime.datetime.now() + datetime.timedelta(days=int(expire_value))).strftime("%Y-%m-%d 23:59:59")
+            else:
+                if expire_year is not None and expire_month is not None and expire_day is not None:
+                    current_year = datetime.datetime.now().year
+                    expire_date = datetime.datetime(current_year + int(expire_year), int(expire_month), int(expire_day), 23, 59, 59)
+                    return expire_date.strftime("%Y-%m-%d 23:59:59")
+                else:
+                    raise Exception("过期年/过期月/过期日不能为空")
+
     @classmethod
     def reward_algorithm(self, value_type, reward_value):
         """
@@ -123,7 +152,6 @@ class CdpHelper:
             else:
                 return order_status
 
-
     @classmethod
     def convert_refund_status(self, platform_id, refund_status):
         """
@@ -146,7 +174,6 @@ class CdpHelper:
             else:
                 return RefundStatus.NO_REFUND.name
 
-
     @classmethod
     def mask_telephone_middle(self, phone_str):
         """
@@ -154,13 +181,12 @@ class CdpHelper:
         :param phone_str: 待处理的手机号
         :return: 处理后的手机号
         """
-        value, status = SevenHelper.to_int(phone_str, return_status=True) 
+        value, status = SevenHelper.to_int(phone_str, return_status=True)
         if len(phone_str) == 11 and status == True:
             return phone_str[:3] + '*' * 4 + phone_str[-4:]
         else:
             return phone_str[:-4] + '****'
-    
-    
+
     @classmethod
     def mask_telephone_first(self, phone_str):
         """
@@ -175,8 +201,7 @@ class CdpHelper:
             return f'+{"*" * (len(phone_str) - 5)}{phone_str[-4:]}'
         else:
             return f'{"*" * (len(phone_str) - 4)}{phone_str[-4:]}'
-   
-    
+
     @classmethod
     def convert_sync_platform_info(self, business_id, one_id, total_integral, old_integral, change_integral, level_id=None, level_valid_date=None):
         """
@@ -190,33 +215,32 @@ class CdpHelper:
         :param level_valid_date: 等级有效期
         :return: 
         """
-        sync_member_info, sync_integral_log = "" , ""
+        sync_member_info, sync_integral_log = "", ""
         if level_id and level_valid_date:
             level_valid_date = str(level_valid_date)
             sync_member_info = SevenHelper.json_dumps({
-                "business_id": business_id, 
+                "business_id": business_id,
                 "one_id": one_id,
                 "version":  TimeHelper.get_now_timestamp(True),
-                "point": total_integral, 
+                "point": total_integral,
                 "level": level_id,
                 "level_expire_time": TimeHelper.format_time_to_timestamp(level_valid_date, out_ms=True)
             })
         if change_integral > 0:
             sync_integral_log = SevenHelper.json_dumps({
-                "business_id": business_id, 
-                "one_id": one_id, 
-                "operate_type": 1, 
-                "channel": 100, 
+                "business_id": business_id,
+                "one_id": one_id,
+                "operate_type": 1,
+                "channel": 100,
                 "biz_scene": 100,
                 "point_type": 1,
                 "raw_quantity":change_integral,
                 "serial_no": SevenHelper.create_order_id(),
-                "change_time": TimeHelper.get_now_timestamp(True), 
-                "old_total_point": old_integral, 
+                "change_time": TimeHelper.get_now_timestamp(True),
+                "old_total_point": old_integral,
                 "total_point": total_integral
             })
         return sync_member_info, sync_integral_log
-   
 
     @classmethod
     def get_platform_name(self, platform_id):

{hk_cdp-1.0.75 → hk_cdp-1.0.76}/hk_cdp/models/db_models/member/member_info_model.py

@@ -2,7 +2,7 @@
 """
 @Author: HuangJianYi
 @Date: 2024-10-15 18:30:21
-@LastEditTime: 2025-01-06 14:31:14
+@LastEditTime: 2025-04-25 18:13:30
 @LastEditors: HuangJianYi
 @Description: 
 """
@@ -40,6 +40,7 @@ class MemberInfo:
         self.sex = 0  # 性别(0-未知 1-男 2-女)
         self.first_ouid = ""  # 首绑ouid
         self.first_store_integral = 0  # 首绑店铺积分
+        self.first_store_level_id = 0  # 首绑店铺等级(为第一个绑定账号的店铺等级)
         self.first_plat_store_id = ""  # 首绑平台店铺标识
         self.first_join_date = '1970-01-01 00:00:00.000'  # 首次入会时间
         self.first_join_store_id = 0  # 首次入会店铺
@@ -54,10 +55,8 @@ class MemberInfo:
     @classmethod
     def get_field_list(self):
         return [
-            'id', 'one_id', 'business_id', 'scheme_id', 'include_plattypes', 'include_stores', 'level_id', 
-            'level_valid_date', 'member_telephone','member_mask_telephone', 'real_name', 'birthday', 'sex', 'first_ouid', 
-            'first_store_integral', 'first_plat_store_id', 'first_join_date', 'first_join_store_id', 
-            'last_join_date', 'last_join_store_id', 'extend_info', 'member_status', 'is_one_merge', 'create_date', 'modify_date'
+            'id', 'one_id', 'business_id', 'scheme_id', 'include_plattypes', 'include_stores', 'level_id', 'level_valid_date', 'member_telephone', 'member_mask_telephone', 'real_name', 'birthday', 'sex', 'first_ouid', 'first_store_integral', 'first_store_level_id',
+            'first_plat_store_id', 'first_join_date', 'first_join_store_id', 'last_join_date', 'last_join_store_id', 'extend_info', 'member_status', 'is_one_merge', 'create_date', 'modify_date'
         ]
 
     @classmethod

{hk_cdp-1.0.75 → hk_cdp-1.0.76}/hk_cdp.egg-info/PKG-INFO

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

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