寄售转让收藏列表

application/api/controller/Market.php

@@ -27,18 +27,17 @@ class Market extends Api
 {
 
 
-      //用户收藏
-      public function collect(UserCollect $userCollect)
-      {
-    
-            $params = $this->request->post();
-            $validate = \think\Loader::validate('Market');
-            if(!$validate->scene('collect')->check($params)) $this->error($validate->getError());
-     
-            $userCollect::setUserCollect($this->auth->id, $params['market_id']);
-            $this->success("ok");
-      }
+    //用户收藏
+    public function collect(UserCollect $userCollect)
+    {
 
+        $params = $this->request->post();
+        $validate = \think\Loader::validate('Market');
+        if(!$validate->scene('collect')->check($params)) $this->error($validate->getError());
+    
+        $userCollect::setUserCollect($this->auth->id, $params['market_id']);
+        $this->success("ok");
+    }
 
 
     /*
@@ -65,10 +64,11 @@ class Market extends Api
         $params = $this->request->post();
         $validate = \think\Loader::validate('Market');
         if(!$validate->scene('announcement')->check($params)) $this->error($validate->getError());
-
         $this->success('ok', $productBuying::getProductBuyingMaxPrice($params['product_id']));
-
     }
+
+    
+
     
     //求购
     public function buying()
@@ -77,8 +77,6 @@ class Market extends Api
         $validate = \think\Loader::validate('Market');
         if(!$validate->scene('announcement')->check($params)) $this->error($validate->getError());
 
-   
-
     }
 
 

application/api/controller/Product.php

@@ -11,11 +11,12 @@ use app\common\model\ProductOrder;
 use app\common\model\ProductsModel;
 use app\common\model\ProductPopular;
 use app\api\logic\OrderLogic;
-use app\common\model\UserCollect;
 
 class Product extends Api
 {
     protected array $noNeedLogin = ['getPopularList'];
+
+
     protected string $lan = '';
 
     public function _initialize()
@@ -108,8 +109,8 @@ class Product extends Api
         if(!empty($key_val)) $map['b.'.$this->lan.'_name'] = ['like', '%'.$key_val.'%'];
         $list = $productMarket->alias('a')
             ->join("product_list b", "a.product_id = b.id", "left")
-            ->join("user_collect c", "c.market_id = a.id", "left")
-            ->field('a.id,'.'b.'.$this->lan.'_name as name,b.thum as img_url,a.price,a.product_id,a.type_id, count(c.market_id) as collect')
+            ->join("user_collect c", "c.market_id = a.id and c.user_id = {$this->auth->id}")
+            ->field('a.id,'.'b.'.$this->lan.'_name as name,b.thum as img_url,a.price,a.product_id,a.type_id')
             ->where('a.status', $productMarket::Normal)
             ->where($map)
             ->order($order)

application/api/validate/Market.php

@@ -20,6 +20,7 @@ class Market extends Validate
       'address'    => 'require',
       'price'      => 'require|number|gt:0',
     ];
+    
     /**
      * 提示消息
      */