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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hk_cdp
-Version: 1.0.79
+Version: 1.0.81
 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.79 → hk_cdp-1.0.81}/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-1.0.79 → hk_cdp-1.0.81}/hk_cdp/models/db_models/trade/trade_info_model.py

@@ -2,7 +2,7 @@
 """
 @Author: HuangJianYi
 @Date: 2024-10-15 18:30:21
-@LastEditTime: 2024-11-06 15:23:22
+@LastEditTime: 2025-06-16 17:48:39
 @LastEditors: HuangJianYi
 @Description: 
 """
@@ -41,6 +41,8 @@ class TradeInfo:
         self.postage = 0.0 # 邮费
         self.discount_price = 0.0 # 优惠金额
         self.refund_price = 0.0 # 退款金额
+        self.buy_num = 0 # 商品件数
+        self.order_num = 0 # 子订单数量
         self.order_status = "" # 订单状态
         self.plat_store_id = "" # 平台店铺标识
         self.receiver = "" # 收货人
@@ -57,7 +59,7 @@ class TradeInfo:
         self.end_date = "1970-01-01 00:00:00.000" # 交易结束时间。交易成功时间(更新交易状态为成功的同时更新)/确认收货时间或者交易关闭时间
         self.source_type = 0 # 来源类型（1-历史备份数据导入 2-天猫会员通 3-抖音会员通）
         self.source_title = "" # 来源说明
-        self.modify_date = "1970-01-01 00:00:00.000" # 修改时间(跟rds同步)  
+        self.modify_date = "1970-01-01 00:00:00.000" # 修改时间(跟rds同步)
         self.is_incr_data = 0 # 是否增量数据(1-是 0-否)
         self.process_date = "1970-01-01 00:00:00.000" # 处理时间
         self.reward_process_status = 0  # 奖励处理状态：0-无需处理1-待处理2-已处理3-延迟处理10-订单异常
@@ -67,15 +69,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', 'order_status', 'plat_store_id',
-            'receiver', 'telephone', 'receiver_province', 'receiver_city',
-            'receiver_county', 'receiver_address', 'seller_remark',
-            'trade_source_types', 'create_date', 'pay_date', 'consign_date',
-            'end_date', 'source_type', 'source_title', 'modify_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', 'buy_num', 'order_num', 'order_status',
+            'plat_store_id', 'receiver', 'telephone', 'receiver_province', 'receiver_city', 'receiver_county', 'receiver_address', 'seller_remark', 'trade_source_types', 'create_date', 'pay_date', 'consign_date', 'end_date', 'source_type', 'source_title', 'modify_date',
+            'is_incr_data', 'process_date', 'reward_process_status', 'refund_process_status', 'surplus_refund_price'
         ]
 
     @classmethod

{hk_cdp-1.0.79 → hk_cdp-1.0.81}/hk_cdp.egg-info/PKG-INFO

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

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