hk-cdp 1.0.116__tar.gz → 1.0.120__tar.gz

{hk_cdp-1.0.116 → hk_cdp-1.0.120}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hk_cdp
-Version: 1.0.116
+Version: 1.0.120
 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.116 → hk_cdp-1.0.120}/hk_cdp/models/db_models/store/store_base_model.py

@@ -2,7 +2,7 @@
 """
 @Author: HuangJianYi
 @Date: 2024-11-19 15:01:40
-@LastEditTime: 2025-01-10 17:29:51
+@LastEditTime: 2025-08-22 17:32:54
 @LastEditors: HuangJianYi
 @Description: 
 """
@@ -38,6 +38,7 @@ class StoreBase:
         self.plat_store_id = ""  # 平台店铺标识
         self.init_integral_multiple = ""  # 初始积分倍数
         self.init_growth_config = {}  # 初始成长值配置
+        self.init_exclude_goods = {} # 初始排除商品
         self.incr_process_start_date = "1970-01-01 00:00:00.000"  # 增量处理时间
         self.is_omid_merge = 0 # 是否走omid合并逻辑(1-是 0-否)
         self.create_date = "1970-01-01 00:00:00.000"  # 创建时间
@@ -46,7 +47,7 @@ class StoreBase:
 
     @classmethod
     def get_field_list(self):
-        return ['id', 'guid', 'business_id', 'scheme_id', 'platform_id', 'store_name', 'seller_nick', 'plat_store_id', 'init_integral_multiple', 'init_growth_config', 'incr_process_start_date', 'is_omid_merge', 'create_date', 'modify_date']
+        return ['id', 'guid', 'business_id', 'scheme_id', 'platform_id', 'store_name', 'seller_nick', 'plat_store_id', 'init_integral_multiple', 'init_growth_config', 'init_exclude_goods', 'incr_process_start_date', 'is_omid_merge', 'create_date', 'modify_date']
 
     @classmethod
     def get_primary_key(self):

{hk_cdp-1.0.116 → hk_cdp-1.0.120}/hk_cdp/models/db_models/trade/__init__.py

@@ -6,4 +6,4 @@
 @LastEditors: HuangJianYi
 @Description: 
 """
-__all__ = ["trade_info_model","trade_order_model","trade_status_info_model","trade_give_info_model"]
+__all__ = ["trade_info_model", "trade_order_model", "trade_status_info_model", "trade_give_info_model", "trade_order_exclude_model"]

{hk_cdp-1.0.116 → hk_cdp-1.0.120}/hk_cdp/models/db_models/trade/trade_info_model.py

@@ -41,6 +41,7 @@ class TradeInfo:
         self.postage = 0.0 # 邮费
         self.discount_price = 0.0 # 优惠金额
         self.refund_price = 0.0 # 退款金额
+        self.settle_price = 0.0 # 结算金额
         self.buy_num = 0 # 商品件数
         self.order_num = 0 # 子订单数量
         self.order_status = "" # 订单状态
@@ -75,9 +76,9 @@ class TradeInfo:
     @classmethod
     def get_field_list(self):
         return [
-            'id', 'main_pay_order_no', 'store_id', 'business_id', 'one_id', 'user_id', 'ouid', 'platform_id', 'seller_nick', 'trade_type', 'step_trade_status', 'order_price', 'pay_price', 'postage', 'discount_price', 'refund_price', 'buy_num', 'order_num', 'order_status',
-            'plat_store_id', 'receiver', 'telephone', 'receiver_province', 'receiver_city', 'receiver_county', 'receiver_address', 'buyer_remark', 'seller_remark', 'seller_flag', 'buyer_rate', 'seller_rate', 'expand_card_basic_price', 'trade_source_types', 'create_date',
-            'pay_date', 'consign_date', 'end_date', 'source_type', 'source_title', 'modify_date', 'inside_date', 'is_incr_data', 'process_date', 'reward_process_status', 'refund_process_status', 'surplus_refund_price'
+            'id', 'main_pay_order_no', 'store_id', 'business_id', 'one_id', 'user_id', 'ouid', 'platform_id', 'seller_nick', 'trade_type', 'step_trade_status', 'order_price', 'pay_price', 'postage', 'discount_price', 'refund_price', 'settle_price', 'buy_num', 'order_num',
+            'order_status', 'plat_store_id', 'receiver', 'telephone', 'receiver_province', 'receiver_city', 'receiver_county', 'receiver_address', 'buyer_remark', 'seller_remark', 'seller_flag', 'buyer_rate', 'seller_rate', 'expand_card_basic_price', 'trade_source_types',
+            'create_date', 'pay_date', 'consign_date', 'end_date', 'source_type', 'source_title', 'modify_date', 'inside_date', 'is_incr_data', 'process_date', 'reward_process_status', 'refund_process_status', 'surplus_refund_price'
         ]
 
     @classmethod

hk_cdp-1.0.120/hk_cdp/models/db_models/trade/trade_order_exclude_model.py

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+"""
+@Author: HuangJianYi
+@Date: 2024-10-15 18:30:21
+@LastEditTime: 2025-07-16 18:14:14
+@LastEditors: HuangJianYi
+@Description:
+"""
+
+from seven_framework.mysql import MySQLHelper
+from seven_framework.base_model import *
+from seven_cloudapp_frame.models.cache_model import *
+
+
+class TradeOrderExcludeModel(CacheModel):
+    def __init__(self, db_connect_key='db_cloudapp', db_config_dict=None, sub_table=None, db_transaction=None, context=None, is_auto=False):
+        super(TradeOrderExcludeModel, self).__init__(TradeOrderExclude, sub_table)
+        if not db_config_dict:
+            db_config_dict = config.get_value(db_connect_key)
+        self.db = MySQLHelper(self.convert_db_config(db_config_dict, is_auto))
+        self.db_connect_key = db_connect_key
+        self.db_transaction = db_transaction
+        self.db.context = context
+
+
+class TradeOrderExclude:
+    def __init__(self):
+        super(TradeOrderExclude, self).__init__()
+        self.id = 0  # id
+        self.user_id = "" # 客户ID
+        self.business_id = 0 # 商家标识
+        self.store_id = 0 # 店铺标识
+        self.main_pay_order_no = "" # 主订单号
+        self.sub_pay_order_no = "" # 子订单号
+        self.goods_id = "" # 商品标识
+        self.is_give_integral = 0  # 是否赠送积分(1-是 0-否)
+        self.is_give_growth = 0  # 是否赠送成长值(1-是 0-否)
+        self.create_date = '1970-01-01 00:00:00'  # 创建时间
+
+
+    @classmethod
+    def get_field_list(self):
+        return [
+            'id', 'user_id', 'business_id', 'store_id', 'main_pay_order_no', 'sub_pay_order_no', 'goods_id', 'is_give_integral', 'is_give_growth', 'create_date'
+        ]
+
+    @classmethod
+    def get_primary_key(self):
+        return "id"
+
+    def __str__(self):
+        return "trade_order_exclude_tb"

{hk_cdp-1.0.116 → hk_cdp-1.0.120}/hk_cdp/models/db_models/trade/trade_order_model.py

@@ -43,16 +43,18 @@ class TradeOrder:
         self.order_price = 0.0 # 子订单金额
         self.pay_price = 0.0 # 子支付金额
         self.discount_price = 0.0 # 优惠金额
+        self.divide_order_price = 0.0 # 分摊后子订单实付金额
         self.order_status = "" # 子订单状态
         self.refund_status = "" # 退款状态
         self.refund_id = "" # 退款订单号
+        self.refund_price = 0.0 # 退款金额
 
     @classmethod
     def get_field_list(self):
         return [
-            'id', 'business_id', 'store_id', 'plat_store_id', 'user_id', 'ouid', 'platform_id', 'main_pay_order_no', 'sub_pay_order_no',
-            'goods_code', 'goods_name', 'goods_pic', 'goods_id', 'sku_id','buy_num', 'goods_price', 'order_price', 'pay_price', 'discount_price', 'order_status', 'refund_status', 'refund_id'
-            ]
+            'id', 'business_id', 'store_id', 'plat_store_id', 'user_id', 'ouid', 'platform_id', 'main_pay_order_no', 'sub_pay_order_no', 'goods_code', 'goods_name', 'goods_pic', 'goods_id', 'sku_id', 'buy_num', 'goods_price', 'order_price', 'pay_price', 'discount_price',
+            'divide_order_price', 'order_status', 'refund_status', 'refund_id', 'refund_price'
+        ]
 
     @classmethod
     def get_primary_key(self):

{hk_cdp-1.0.116 → hk_cdp-1.0.120}/hk_cdp/models/enum.py

@@ -2,7 +2,7 @@
 """
 :Author: HuangJianYi
 :Date: 2024-11-25 17:06:14
-@LastEditTime: 2024-12-18 17:47:36
+@LastEditTime: 2025-08-28 15:39:43
 @LastEditors: HuangJianYi
 :description: 枚举类
 """
@@ -93,3 +93,4 @@ class GrowthConfigType(Enum):
     base = 2  # 基础设置
     deduct = 3  # 扣减设置
     valid = 4  # 有效期设置
+    shield_reward = 5  # 屏蔽/奖励设置

{hk_cdp-1.0.116 → hk_cdp-1.0.120}/hk_cdp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hk-cdp
-Version: 1.0.116
+Version: 1.0.120
 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.116 → hk_cdp-1.0.120}/hk_cdp.egg-info/SOURCES.txt

@@ -62,6 +62,7 @@ hk_cdp/models/db_models/taobao/taobao_source_history_member_model.py
 hk_cdp/models/db_models/trade/__init__.py
 hk_cdp/models/db_models/trade/trade_give_info_model.py
 hk_cdp/models/db_models/trade/trade_info_model.py
+hk_cdp/models/db_models/trade/trade_order_exclude_model.py
 hk_cdp/models/db_models/trade/trade_order_model.py
 hk_cdp/models/db_models/trade/trade_status_info_model.py
 hk_cdp/models/db_models/tt/__init__.py

{hk_cdp-1.0.116 → hk_cdp-1.0.120}/setup.py

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