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

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

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

@@ -43,6 +43,7 @@ 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 = "" # 退款订单号
@@ -50,9 +51,9 @@ class TradeOrder:
     @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'
+        ]
 
     @classmethod
     def get_primary_key(self):

hk_cdp-1.0.117/hk_cdp/models/settle/__init__.py

@@ -0,0 +1 @@
+__all__ = ["settle_exclude_goods_model"]

hk_cdp-1.0.117/hk_cdp/models/settle/settle_exclude_goods_model.py

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+"""
+@Author: HuangJianYi
+@Date: 2024-10-15 18:30:21
+@LastEditTime: 2024-12-31 10:54:55
+@LastEditors: HuangJianYi
+@Description: 
+"""
+from seven_framework.mysql import MySQLHelper
+from seven_framework.base_model import *
+from seven_cloudapp_frame.models.cache_model import *
+
+
+class SettleExcludeGoodsModel(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(SettleExcludeGoodsModel, self).__init__(SettleExcludeGoods, 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 SettleExcludeGoods:
+    def __init__(self):
+        super(SettleExcludeGoods, self).__init__()
+        self.id = 0 # id
+        self.guid = 0  # guid
+        self.business_id = 0 # 商家标识
+        self.store_id = 0 # 店铺标识
+        self.platform_id = 0  # 平台标识
+        self.goods_id = '' # 商品ID
+        self.create_date = '' # 创建时间
+
+    @classmethod
+    def get_field_list(self):
+        return ['id', 'guid', 'business_id', 'store_id', 'platform_id', 'goods_id', 'create_date']
+
+    @classmethod
+    def get_primary_key(self):
+        return "id"
+
+    def __str__(self):
+        return "settle_exclude_goods_tb"

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

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

@@ -73,4 +73,6 @@ hk_cdp/models/db_models/tt/tt_source_history_member_model.py
 hk_cdp/models/db_models/user/__init__.py
 hk_cdp/models/db_models/user/user_data_model.py
 hk_cdp/models/db_models/user/user_info_model.py
-hk_cdp/models/db_models/user/user_trends_model.py
+hk_cdp/models/db_models/user/user_trends_model.py
+hk_cdp/models/settle/__init__.py
+hk_cdp/models/settle/settle_exclude_goods_model.py

{hk_cdp-1.0.116 → hk_cdp-1.0.117}/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.117",
     author="seven",
     author_email="tech@gao7.com",
     description="hk cdp",