From 8f7cfb4ca141ce1db81b0b21e22b0ee3353520a6 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期一, 12 六月 2023 11:41:32 +0800
Subject: [PATCH] no message
---
application/api/logic/commission/Tb.php | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/application/api/logic/commission/Tb.php b/application/api/logic/commission/Tb.php
index 918d0df..471c6e5 100644
--- a/application/api/logic/commission/Tb.php
+++ b/application/api/logic/commission/Tb.php
@@ -68,15 +68,27 @@
*/
public function fanliCommissionNew($order)
{
+ $trade_id = isset($order['trade_id']) ? $order['trade_id'] : '';
+ if(empty($trade_id)) return ['status'=>false,'info'=>'璁㈠崟鍙蜂负绌�'];
//鏍规嵁娣樺疂缁戝畾娓犻亾id鏌ヨ鐢ㄦ埛淇℃伅
$ModelUser = new ModelUser();
$user = $ModelUser->where(['t_relation_id'=>$order['relation_id']])->find();
- if(!empty($user)){
- //鏌ヨ鏄惁鏄鍗曞晢鍝�
- $first_browse=DB::name('user_first_free_browse')->where(['user_id'=>$user['id'],'is_order'=>1])->find();
- if(!empty($first_browse)){
+ if(!empty($user))
+ {
+ $browse=DB::name('user_first_free_browse')->where(['user_id'=>$user['id'],'is_order'=>1])->find();
+ if(!empty($browse)){
+ //鏌ヨ鏄惁鏄鍗曞晢鍝�
+ $first_browse=DB::name('user_first_free_browse')->where(['user_id'=>$user['id'],'tid'=>$order['trade_id']])->find();
+ if(!empty('first_browse')){
+ //璁＄畻棣栧崟杩斿埄
+ $res=self::fanliCommissionForFree($order);
+ return $res;
+ }
+ else{
$res=self::fanliCommission($order);
return $res;
+ }
+
}
else{
$itemid=explode("-",$order['item_id']);
@@ -91,8 +103,8 @@
return $res;
}
-
}
+
}
else{
//鏍囪璁㈠崟涓烘棤闇�鍒嗛攢
@@ -301,6 +313,7 @@
$trade_id = isset($order['trade_id']) ? $order['trade_id'] : '';
if(empty($trade_id)) return ['status'=>false,'info'=>'璁㈠崟鍙蜂负绌�'];
+ $itemid=explode("-",$order['item_id']);
Db::startTrans();
$ModelUser = new ModelUser();
$user = $ModelUser->where(['t_relation_id'=>$order['relation_id']])->find();
@@ -318,7 +331,7 @@
if($order['tk_status'] == 13){ //璁㈠崟澶辨晥锛屾洿鏂拌鍗曚负鏃犻渶鍒嗛攢
$ModelOrder->where(['id'=>$order['id']])->update(['is_distribution'=>2,'update_time'=>time()]);
//鏇存柊棣栧崟鏍囪璁板綍
- Db::name('user_first_free_browse')->where(['user_id'=>$user['id'],'new_goodsId'=>$order['item_id']])->update(['tid'=>$trade_id,'is_order'=>0]);
+ Db::name('user_first_free_browse')->where(['user_id'=>$user['id']])->where('new_goodsId','like','%' . $itemid[1] . '')->update(['tid'=>$trade_id,'is_order'=>0]);
Db::commit();
return ['status'=>true,'info'=>'璁㈠崟澶辨晥锛屾棤闇�鍒嗛攢'];
}
@@ -385,7 +398,7 @@
return ['status'=>false,'info'=>'鏇存柊璁㈠崟sign閿欒,璁㈠崟ID涓�:'.$order['id']];
}
}
- Db::name('user_first_free_browse')->where(['user_id'=>$user['id'],'new_goodsId'=>$order['item_id']])->update(['tid'=>$trade_id,'is_order'=>1]);
+ Db::name('user_first_free_browse')->where(['user_id'=>$user['id']])->where('new_goodsId','like','%' . $itemid[1] . '')->update(['tid'=>$trade_id,'is_order'=>1]);
Db::commit();
return ['status'=>true,'info'=>'棣栧崟鎷嗗垎鎴愬姛'];
}
--
Gitblit v1.9.3