From a7cecc9276a78c96850121b283f52f830113f6e0 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期一, 24 七月 2023 12:14:12 +0800
Subject: [PATCH] no message

---
 application/api/controller/Taoke.php |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/application/api/controller/Taoke.php b/application/api/controller/Taoke.php
index 93ba01f..a47c9b4 100644
--- a/application/api/controller/Taoke.php
+++ b/application/api/controller/Taoke.php
@@ -398,8 +398,9 @@
         if(empty($goods_sign)) $this->error('鍟嗗搧sign涓嶈兘涓虹┖');
 
         $LogicPdd = new LogicPdd();
-
-        $info = $LogicPdd->getGoodsDetail($goods_sign);
+        $ModelUser = new ModelUser();
+        $user = $ModelUser->get(USERID);
+        $info = $LogicPdd->getGoodsDetail($goods_sign,true,$user['common_relation_id']);
 
         if($info === false) $this->error($LogicPdd->getError());
 
@@ -1550,14 +1551,25 @@
         $this->success('鑾峰彇鎴愬姛',['list'=>$list]);
     }
 
+      /**
+     * 鍟嗗搧姣斾环
+     *
+     * @return void
+     */
+
     public function compare_good(){
         $content = request()->param('content','');
         if (empty($content)) $this->error('鍐呭涓嶈兘涓虹┖');
-
+        $exclude_tb = request()->param('exclude_tb',0);
+        $exclude_jd = request()->param('exclude_jd',0);
+        $exclude_pdd = request()->param('exclude_pdd',0);
+        $exclude_dy = request()->param('exclude_dy',0);
+        $content = request()->param('content','');
+        $content = request()->param('content','');
         $LogicSearch = new LogicSearch();
         $user = $this->auth->getUser();
         $common_relation_id = $user['common_relation_id'];
-        $info = $LogicSearch->compare_good($content,$common_relation_id);
+        $info = $LogicSearch->compare_good($content,$common_relation_id,$exclude_tb,$exclude_jd,$exclude_pdd,$exclude_dy);
         $this->success('鑾峰彇鎴愬姛',['list'=>$info]);
     
     }

--
Gitblit v1.9.3