From 2d17ad0566b8e0efc319f926fd08316c8ab34ead Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 09:37:40 +0800
Subject: [PATCH] Merge tag '0元购商品修复' into develop
---
application/api/logic/commission/Tb.php | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/application/api/logic/commission/Tb.php b/application/api/logic/commission/Tb.php
index 0a2cecd..099863e 100644
--- a/application/api/logic/commission/Tb.php
+++ b/application/api/logic/commission/Tb.php
@@ -70,10 +70,16 @@
{
$trade_id = isset($order['trade_id']) ? $order['trade_id'] : '';
if(empty($trade_id)) return ['status'=>false,'info'=>'璁㈠崟鍙蜂负绌�'];
+ //鍒ゆ柇鏄疄浠橀噾棰濇槸鍚﹀ぇ浜�4鍏冿紝澶т簬4鍏冪洿鎺ユ櫘閫氳繑鍒�
+ if(floatval($order['alipay_total_price'])>4){
+ $res=self::fanliCommission($order);
+ return $res;
+ }
//鏍规嵁娣樺疂缁戝畾娓犻亾id鏌ヨ鐢ㄦ埛淇℃伅
$ModelUser = new ModelUser();
$user = $ModelUser->where(['t_relation_id'=>$order['relation_id']])->find();
- if(!empty($user)){
+ if(!empty($user))
+ {
$browse=DB::name('user_first_free_browse')->where(['user_id'=>$user['id'],'is_order'=>1])->find();
if(!empty($browse)){
//鏌ヨ鏄惁鏄鍗曞晢鍝�
@@ -104,7 +110,7 @@
}
}
- }
+ }
else{
//鏍囪璁㈠崟涓烘棤闇�鍒嗛攢
$ModelOrder = new ModelTaobaoOrder();
@@ -343,7 +349,7 @@
'is_own' => 1,
'alipay_total_price' => $order['alipay_total_price'],
'pub_share_pre_fee' => !empty($order['pub_share_pre_fee']) ? $order['alipay_total_price'] : "",
- 'pub_share_fee' => !empty($order['pay_price']) ? $order['alipay_total_price'] : "",
+ 'pub_share_fee' => !empty($order['pay_price'])&&$order['pay_price']>0 ? $order['alipay_total_price'] : "",
'refund_tag' => $order['refund_tag'],
'item_img' => $order['item_img'],
'item_title' => $order['item_title'],
@@ -377,7 +383,7 @@
$item_data = [
'alipay_total_price' => $order['alipay_total_price'],
'pub_share_pre_fee' => !empty($order['pub_share_pre_fee']) ? $order['alipay_total_price'] : "",
- 'pub_share_fee' => !empty($order['pay_price']) ? $order['alipay_total_price'] : "",
+ 'pub_share_fee' => !empty($order['pay_price'])&&$order['pay_price']>0 ? $order['alipay_total_price'] : "",
'refund_tag' => $order['refund_tag'],
'tk_status' => $order['tk_status'],
'pay_price' => $order['pay_price'],
--
Gitblit v1.9.3