diff --git a/app/admin/controller/product/Product.php b/app/admin/controller/product/Product.php
index f2e4479..d4b44aa 100644
--- a/app/admin/controller/product/Product.php
+++ b/app/admin/controller/product/Product.php
@@ -95,16 +95,16 @@ class Product extends BaseController
             $where['cate_id'] = empty($params['plate_cate'])?'':$params['plate_cate'];
 
             // 商户商品分类id
-            $where['mer_cate_id'] = empty($params['store_cate'])?'':$params['store_cate'];
-            $where['is_trader'] = isset($params['is_trader'])?$params['is_trader']:0; // 是否自营 1自营， 0 不是自营
+            // $where['mer_cate_id'] = empty($params['store_cate'])?'':$params['store_cate'];
+            $where['is_trader'] = isset($params['is_trader'])?$params['is_trader']:1; // 是否自营 1自营， 0 不是自营
 
             // product
             $where['is_gift_bag'] = empty($params['is_gift'])?'':$params['is_gift'];
             $where['is_show'] = empty($params['state'])?'':$params['state'];
-            $where['temp_id'] = empty($params['shipping_tem'])?'':$params['shipping_tem'];
+            // $where['temp_id'] = empty($params['shipping_tem'])?'':$params['shipping_tem'];
             $where['labels'] = empty($params['tag'])?'':$params['tag'];
             $where['type'] = 1;//实体商品：0 虚拟商品:1
-            $where['status'] = 0;//管理、审核、通过
+            // $where['status'] = 0;//管理、审核、通过
 
 
             // $where['is_ficti'] = 1;//是否虚拟销量
@@ -117,20 +117,15 @@ class Product extends BaseController
             }
             $mer_id = 77;
 
-            $this->product->getList($mer_id, $where, $page, $limit);
-
-            return;
-            
-            $total = EbStoreProduct::where($where)->count();
+            $data = $this->product->getList($mer_id, $where, $page, $limit);
 
             
-
-            $list = EbStoreProduct::with(['merchant' => ['merchantType', 'category']])->order('product_id desc')->select();
+            // $list = EbStoreProduct::with(['merchant' => ['merchantType', 'category']])->order('product_id desc')->select();
 
             View::assign('url', $this->url);
-            View::assign('list', $list);
+            View::assign('list', $data['list']);
  
-            $result = ['total' => $total, 'data' => $list];
+            $result = ['total' => $data['count'], 'data' => $data['list']];
 
             return table_assign(0, '', $result);
 
diff --git a/app/admin/model/EbStoreProduct.php b/app/admin/model/EbStoreProduct.php
index 67c889a..d127f64 100644
--- a/app/admin/model/EbStoreProduct.php
+++ b/app/admin/model/EbStoreProduct.php
@@ -11,8 +11,49 @@
 namespace app\admin\model;
 
 use think\Model;
-use StoreCategory as StoreCategoryModel;
+use app\admin\model\store\ProductCate;
 
+
+if (!function_exists('hasMany')) {
+  function hasMany($collection, $field, $model, $searchKey, $insertKey, $where = [] ,$select = '*')
+  {
+      $ids = [];
+      $link = [];
+
+      if (!$collection) return [];
+      $collection = $collection->toArray();
+      foreach ($collection as $k => $item) {
+          if (is_array($item[$field])) {
+              $link[$k] = array_unique($item[$field]);
+              $ids = array_merge($item[$field], $ids);
+          } else {
+              $link[$k] = array_unique(explode(',', $item[$field]));
+          }
+          $ids = array_merge($link[$k], $ids);
+          if (isset($collection[$k][$insertKey])) unset($collection[$k][$insertKey]);
+      }
+      $ids = array_filter(array_unique($ids));
+      if (!count($ids)) {
+          return $collection;
+      }
+      $many = $model::whereIn($searchKey, array_unique($ids))->where($where)->field($select)->select();
+
+      if (!$many) return $collection;
+      $many = $many->toArray();
+      foreach ($link as $k => $val) {
+          foreach ($many as $item) {
+              if (in_array($item[$searchKey], $val)) {
+
+                  if (!isset($collection[$k][$insertKey])) $collection[$k][$insertKey] = [];
+
+                  $collection[$k][$insertKey][] = $item;
+              }
+          }
+      }
+
+      return $collection;
+  }
+}
 class EbStoreProduct extends Model
 {
   // 设置当前模型的数据库连接
@@ -30,12 +71,23 @@ class EbStoreProduct extends Model
    * 
    */
   public function merchant()
+    {
+        return $this->hasOne(Merchant::class,'mer_id','mer_id')->field('is_trader,type_id,mer_id,mer_name,mer_avatar,product_score,service_score,postage_score,service_phone,care_count');
+    }
+
+  public function storeCategory()
   {
-    return $this->hasOne(Merchant::class, 'mer_id', 'mer_id');
+      return $this->hasOne(StoreCategory::class,'store_category_id','cate_id')->field('store_category_id,cate_name');
+  }
+  public function merCateId()
+  {
+      return $this->hasMany(ProductCate::class,'product_id','product_id')->field('product_id,mer_cate_id');
   }
 
-
-
+  public function brand()
+    {
+        return $this->hasOne(StoreBrand::class,'brand_id','brand_id')->field('brand_id,brand_name');
+    }
 
   /**
    * TODO 商户商品列表
@@ -49,22 +101,24 @@ class EbStoreProduct extends Model
    */
   public function getList(?int $mer_id, array $where, int $page, int $limit)
   {
-    $query = self::search($mer_id, $where);
-    // ->with(['merCateId.category', 'storeCategory', 'brand']);
+    $query = self::search($mer_id, $where)
+    ->with(['merCateId.category', 'storeCategory', 'brand']);
     $count = $query->count();
-    $data = $query->field($this->filed)->page($page, $limit)->select();
+    $data = $query->field($this->filed)->page($page, $limit)
+    ->order('product_id desc')
+    ->select();
+    $data->append(['us_status']);
 
-    // $data->append(['us_status']);
+    $list = hasMany(
+      $data,
+      'mer_labels',
+      ProductLabel::class,
+      'product_label_id',
+      'mer_labels',
+      ['status' => 1],
+      'product_label_id,product_label_id id,label_name name'
+    );
 
-    // $list = hasMany(
-    //   $data,
-    //   'mer_labels',
-    //   ProductLabel::class,
-    //   'product_label_id',
-    //   'mer_labels',
-    //   ['status' => 1],
-    //   'product_label_id,product_label_id id,label_name name'
-    // );
 
     return compact('count', 'list');
   }
@@ -98,17 +152,31 @@ class EbStoreProduct extends Model
 
     $query = self::alias('Product');
     if (isset($where['is_trader']) && $where['is_trader'] !== '') {
-      $query->hasWhere('merchant', function ($query) use ($where) {
-        $query->where('is_trader', $where['is_trader']);
-      });
+      $query->Join('Merchant', 'Merchant.mer_id = Product.mer_id')
+      ->where('Merchant.is_trader', $where['is_trader'])
+      ->when(($merId !== null), 
+        function ($query) use ($merId) {
+          $query->where('Product.mer_id', $merId);
+        }
+      );
+
+      // $query->hasWhere('merchant', 
+      //   function ($query) use ($where) {
+      //     $query->where('is_trader', $where['is_trader']);
+      //   }
+      // );
     }
-   
+
     $query->withSearch($keyArray, $whereArr)
-      ->Join('StoreSpu U', 'Product.product_id = U.product_id')->where('U.product_type', $where['product_type'] ?? 0)
-      ->when(($merId !== null), function ($query) use ($merId) {
+    ->Join('StoreSpu U', 'Product.product_id = U.product_id')
+    ->where('U.product_type', $where['product_type'] ?? 0)
+    ->when(($merId !== null), 
+      function ($query) use ($merId) {
         $query->where('Product.mer_id', $merId);
-      })
-      ->when(isset($where['hot_type']) && $where['hot_type'] !== '', function ($query) use ($where) {
+      }
+    )
+    ->when(isset($where['hot_type']) && $where['hot_type'] !== '', 
+      function ($query) use ($where) {
         if ($where['hot_type'] == 'new')
           $query->where('is_new', 1);
         else if ($where['hot_type'] == 'hot')
@@ -117,61 +185,62 @@ class EbStoreProduct extends Model
           $query->where('is_best', 1);
         else if ($where['hot_type'] == 'good')
           $query->where('is_benefit', 1);
-      });
-
-      $query->when(
-        isset($where['pid']) && $where['pid'] !== '',
-        function ($query) use ($where) {
-          $ids = array_merge(self::findChildrenId((int)$where['pid']), [(int)$where['pid']]);
-          if (count($ids)) $query->whereIn('cate_id', $ids);
-        }
-      )
-      ->when(isset($where['us_status']) && $where['us_status'] !== '', function ($query) use ($where) {
-        if ($where['us_status'] == 0) {
-          $query->where('Product.is_show', 0)->where('Product.is_used', 1)->where('Product.status', 1);
-        }
-        if ($where['us_status'] == 1) {
-          $query->where('Product.is_show', 1)->where('Product.is_used', 1)->where('Product.status', 1);
-        }
-        if ($where['us_status'] == -1) {
-          $query->where(function ($query) {
-            $query->where('Product.is_used', 0)->whereOr('Product.status', '<>', 1);
-          });
-        }
-      })
-      ->when(isset($where['mer_labels']) && $where['mer_labels'] !== '', function ($query) use ($where) {
-        $query->whereLike('U.mer_labels', "%,{$where['mer_labels']},%");
-      })
-      ->when(isset($where['sys_labels']) && $where['sys_labels'] !== '', function ($query) use ($where) {
-        $query->whereLike('U.sys_labels', "%,{$where['sys_labels']},%");
-      })
-      ->when(isset($where['order']), function ($query) use ($where, $merId) {
-        if (in_array($where['order'], ['is_new', 'price_asc', 'price_desc', 'rate', 'sales'])) {
-          if ($where['order'] == 'price_asc') {
-            $where['order'] = 'price ASC';
-          } else if ($where['order'] == 'price_desc') {
-            $where['order'] = 'price DESC';
-          } else {
-            $where['order'] = $where['order'] . ' DESC';
-          }
-          $query->order($where['order'] . ',rank DESC ,create_time DESC ');
-        } else if ($where['order'] !== '') {
-          $query->order('U.' . $where['order'] . ' DESC,U.create_time DESC');
-        } else {
-          $query->order('U.create_time DESC');
-        }
-      })
-      ->when(isset($where['star']), function ($query) use ($where) {
-        $query->when($where['star'] !== '', function ($query) use ($where) {
-          $query->where('U.star', $where['star']);
+      }
+    )
+    ->when(
+      isset($where['pid']) && $where['pid'] !== '',
+      function ($query) use ($where) {
+        $ids = array_merge(self::findChildrenId((int)$where['pid']), [(int)$where['pid']]);
+        if (count($ids)) $query->whereIn('cate_id', $ids);
+      }
+    )
+    ->when(isset($where['us_status']) && $where['us_status'] !== '', function ($query) use ($where) {
+      if ($where['us_status'] == 0) {
+        $query->where('Product.is_show', 0)->where('Product.is_used', 1)->where('Product.status', 1);
+      }
+      if ($where['us_status'] == 1) {
+        $query->where('Product.is_show', 1)->where('Product.is_used', 1)->where('Product.status', 1);
+      }
+      if ($where['us_status'] == -1) {
+        $query->where(function ($query) {
+          $query->where('Product.is_used', 0)->whereOr('Product.status', '<>', 1);
         });
-        $query->order('U.star DESC,U.rank DESC,Product.create_time DESC');
+      }
+    })
+    ->when(isset($where['mer_labels']) && $where['mer_labels'] !== '', function ($query) use ($where) {
+      $query->whereLike('U.mer_labels', "%,{$where['mer_labels']},%");
+    })
+    ->when(isset($where['sys_labels']) && $where['sys_labels'] !== '', function ($query) use ($where) {
+      $query->whereLike('U.sys_labels', "%,{$where['sys_labels']},%");
+    })
+    ->when(isset($where['order']), function ($query) use ($where, $merId) {
+      if (in_array($where['order'], ['is_new', 'price_asc', 'price_desc', 'rate', 'sales'])) {
+        if ($where['order'] == 'price_asc') {
+          $where['order'] = 'price ASC';
+        } else if ($where['order'] == 'price_desc') {
+          $where['order'] = 'price DESC';
+        } else {
+          $where['order'] = $where['order'] . ' DESC';
+        }
+        $query->order($where['order'] . ',rank DESC ,create_time DESC ');
+      } else if ($where['order'] !== '') {
+        $query->order('U.' . $where['order'] . ' DESC,U.create_time DESC');
+      } else {
+        $query->order('U.create_time DESC');
+      }
+    })
+    ->when(isset($where['star']), function ($query) use ($where) {
+      $query->when($where['star'] !== '', function ($query) use ($where) {
+        $query->where('U.star', $where['star']);
       });
+      $query->order('U.star DESC,U.rank DESC,Product.create_time DESC');
+    });
+
     return $query;
   }
 
   public function findChildrenId($id)
   {
-      return StoreCategoryModel::whereLike('path', '%/'. $id . '/%')->column('store_category_id');
+    return StoreCategory::whereLike('path', '%/' . $id . '/%')->column('store_category_id');
   }
 }
diff --git a/app/admin/model/ProductLabel.php b/app/admin/model/ProductLabel.php
new file mode 100644
index 0000000..e7d8c38
--- /dev/null
+++ b/app/admin/model/ProductLabel.php
@@ -0,0 +1,58 @@
+<?php
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+namespace app\common\model\store\product;
+
+use app\common\model\BaseModel;
+
+class ProductLabel extends BaseModel
+{
+    /**
+     * TODO
+     * @return string
+     * @author Qinii
+     * @day 8/17/21
+     */
+    public static function tablePk(): string
+    {
+        return 'product_label_id';
+    }
+
+    /**
+     * TODO
+     * @return string
+     * @author Qinii
+     * @day 8/17/21
+     */
+    public static function tableName(): string
+    {
+        return 'store_product_label';
+    }
+
+    public function searchMerIdAttr($query, $value)
+    {
+        $query->where('mer_id', $value);
+    }
+
+    public function searchStatusAttr($query, $value)
+    {
+        $query->where('status', $value);
+    }
+
+    public function searchNameAttr($query, $value)
+    {
+        $query->whereLike('name', "%{$value}%");
+    }
+
+    public function searchIsDelAttr($query, $value)
+    {
+        $query->where('is_del', $value);
+    }
+}
diff --git a/app/admin/model/store/Product.php b/app/admin/model/store/Product.php
new file mode 100644
index 0000000..2c2358d
--- /dev/null
+++ b/app/admin/model/store/Product.php
@@ -0,0 +1,536 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+namespace app\common\model\store\product;
+
+use app\common\dao\store\StoreSeckillActiveDao;
+use app\common\model\BaseModel;
+use app\common\model\store\coupon\StoreCouponProduct;
+use app\common\model\store\Guarantee;
+use app\common\model\store\GuaranteeTemplate;
+use app\common\model\store\GuaranteeValue;
+use app\common\model\store\parameter\ParameterValue;
+use app\common\model\store\shipping\ShippingTemplate;
+use app\common\model\store\StoreBrand;
+use app\common\model\store\StoreCategory;
+use app\common\model\store\StoreSeckillActive;
+use app\common\model\system\merchant\Merchant;
+use app\common\repositories\store\StoreCategoryRepository;
+use crmeb\services\VicWordService;
+use Darabonba\GatewaySpi\Models\InterceptorContext\request;
+use think\db\BaseQuery;
+use think\facade\Db;
+use think\model\concern\SoftDelete;
+
+class Product extends BaseModel
+{
+    use SoftDelete;
+
+    protected $deleteTime = 'is_del';
+    protected $defaultSoftDelete = 0;
+    /**
+     * @Author:Qinii
+     * @Date: 2020/5/8
+     * @return string
+     */
+    public static function tablePk(): string
+    {
+        return 'product_id';
+    }
+
+    /**
+     * @Author:Qinii
+     * @Date: 2020/5/8
+     * @return string
+     */
+    public static function tableName(): string
+    {
+        return 'store_product';
+    }
+
+    /*
+     * -----------------------------------------------------------------------------------------------------------------
+     * 属性
+     * -----------------------------------------------------------------------------------------------------------------
+    */
+    public function getSliderImageAttr($value)
+    {
+        return $value ? explode(',',$value) : [];
+    }
+    public function getGiveCouponIdsAttr($value)
+    {
+        return $value ? explode(',',$value) : [];
+    }
+    public function getMaxExtensionAttr($value)
+    {
+        if($this->extension_type){
+            $org_extension =  ($this->attrValue()->order('extension_two DESC')->value('extension_one'));
+        } else {
+            $org_extension = bcmul(($this->attrValue()->order('price DESC')->value('price')) , systemConfig('extension_one_rate'),2);
+        }
+        $spreadUser = (request()->isLogin() &&  request()->userType() == 1  ) ? request()->userInfo() : null;
+        if ($spreadUser && $spreadUser->brokerage_level > 0 && $spreadUser->brokerage && $spreadUser->brokerage->extension_one_rate > 0) {
+            $org_extension = bcmul($org_extension, 1 + $spreadUser->brokerage->extension_one_rate, 2);
+        }
+        return $org_extension;
+    }
+    public function getMinExtensionAttr($value)
+    {
+        if($this->extension_type){
+            $org_extension = ($this->attrValue()->order('extension_two ASC')->value('extension_two'));
+        } else {
+            $org_extension = bcmul(($this->attrValue()->order('price ASC')->value('price')) , systemConfig('extension_one_rate'),2);
+        }
+        $spreadUser = (request()->isLogin() &&  request()->userType() == 1 ) ? request()->userInfo() : null;
+        if ($spreadUser && $spreadUser->brokerage_level > 0 && $spreadUser->brokerage && $spreadUser->brokerage->extension_one_rate > 0) {
+            $org_extension = bcmul($org_extension, 1 + $spreadUser->brokerage->extension_one_rate, 2);
+        }
+        return $org_extension;
+    }
+
+    public function check()
+    {
+        if(!$this || !$this->is_show || !$this->is_used || !$this->status || $this->is_del || !$this->mer_status) return false;
+        return true;
+    }
+
+    /**
+     * TODO 秒杀商品结束时间
+     * @return false|int
+     * @author Qinii
+     * @day 2020-08-15
+     */
+    public function getEndTimeAttr()
+    {
+        if($this->product_type !== 1) return true;
+        $day = date('Y-m-d',time());
+        $_day = strtotime($day);
+        $end_day = strtotime($this->seckillActive['end_day']);
+        if($end_day >= $_day)
+            return strtotime($day.$this->seckillActive['end_time'].':00:00');
+        if($end_day < strtotime($day))
+            return strtotime(date('Y-m-d',$end_day).$this->seckillActive['end_time'].':00:00');
+    }
+
+    /**
+     * TODO 秒杀商品状态
+     * @return array|int
+     * @author Qinii
+     * @day 2020-08-19
+     */
+    public function getSeckillStatusAttr()
+    {
+        if($this->product_type !== 1) return true;
+        $day = strtotime(date('Y-m-d',time()));
+        $_h = date('H',time());
+        $start_day = strtotime($this->seckillActive['start_day']);
+        $end_day = strtotime($this->seckillActive['end_day']);
+        if(!$this->seckillActive) return '';
+        if($this->seckillActive['status'] !== -1){
+            //还未开始
+            if($start_day > time() || $this->is_show !== 1)return 0;
+            //已结束
+            if($end_day < $day) return -1;
+            //开始 - 结束
+            if($start_day <= $day && $day <= $end_day){
+                //未开始
+                if($this->seckillActive['start_time'] > $_h) return 0;
+                //已结束
+                if($this->seckillActive['end_time'] <= $_h) return -1;
+                //进行中
+                if($this->seckillActive['start_time'] <= $_h && $this->seckillActive['end_time'] > $_h) return 1;
+            }
+        }
+        //已结束
+        return -1;
+
+    }
+
+    public function getImageAttr($value)
+    {
+        if (is_int(strpos($value, 'http'))){
+            return $value;
+        }else{
+            return rtrim(systemConfig('site_url'),'/') .$value;
+        }
+    }
+
+    public function getTopReplyAttr()
+    {
+        $res = ProductReply::where('product_id',$this->product_id)->where('is_del',0)->with(['orderProduct'])->field('reply_id,uid,nickname,merchant_reply_content,avatar,order_product_id,product_id,product_score,service_score,postage_score,comment,pics,rate,create_time')
+            ->order('sort DESC,create_time DESC')->limit(1)->find();
+        if(!$res) return null;
+        if ($res['orderProduct'])
+            $res['sku'] = $res['orderProduct']['cart_info']['productAttr']['sku'];
+        unset($res['orderProduct']);
+        if (strlen($res['nickname']) > 1) {
+            $str = mb_substr($res['nickname'],0,1) . '*';
+            if (strlen($res['nickname']) > 2) {
+                $str .= mb_substr($res['nickname'], -1,1);
+            }
+            $res['nickname'] = $str;
+        }
+
+        return $res;
+    }
+
+    public function getUsStatusAttr()
+    {
+        return ($this->status == 1) ? ($this->is_used == 1 ? ( $this->is_show ? 1 : 0 ) : -1) : -1;
+    }
+
+    public function getGuaranteeTemplateAttr()
+    {
+        $gua = GuaranteeTemplate::where('guarantee_template_id',$this->guarantee_template_id)->where('status',1)->where('is_del',0)->find();
+        if(!$gua) return [];
+        $guarantee_id = GuaranteeValue::where('guarantee_template_id',$this->guarantee_template_id)->column('guarantee_id');
+        return Guarantee::where('guarantee_id','in',$guarantee_id)->where('status',1)->where('is_del',0)->select();
+    }
+
+    public function getMaxIntegralAttr()
+    {
+        if(systemConfig('integral_status') && merchantConfig($this->mer_id,'mer_integral_status')){
+            $price = ($this->attrValue()->order('price DESC')->value('price'));
+            $rate = ($this->integral_rate < 0) ? merchantConfig($this->mer_id,'mer_integral_rate') : $this->integral_rate;
+            $rate = $rate < 0 ? $rate / 100 : 0;
+            return bcmul($price ,$rate,2);
+        }
+        return '0';
+    }
+
+    public function getHotRankingAttr()
+    {
+        if ($this->product_type == 0) {
+            $where = [
+                'is_show'       => 1,
+                'status'        => 1,
+                'is_used'       => 1,
+                'product_type'  => 0,
+                'mer_status'    => 1,
+                'is_gift_bag'   => 0,
+                'cate_id' => $this->cate_id
+            ];
+            self::where($where)->order('sales DESC');
+        }
+    }
+
+    /**
+     * TODO 商品参数
+     * @author Qinii
+     * @day 2022/11/24
+     */
+    public function getParamsAttr()
+    {
+        if(in_array($this->product_type,[0,2])) {
+            $product_id = $this->product_id;
+        } else {
+            $product_id = $this->old_product_id;
+        }
+        return ParameterValue::where('product_id',$product_id)->order('parameter_value_id ASC')->select();
+    }
+
+    public function getParamTempIdAttr($value)
+    {
+        return $value ? explode(',',$value) : $value;
+    }
+
+    /*
+     * -----------------------------------------------------------------------------------------------------------------
+     *  关联模型
+     * -----------------------------------------------------------------------------------------------------------------
+    */
+    public function merCateId()
+    {
+        return $this->hasMany(ProductCate::class,'product_id','product_id')->field('product_id,mer_cate_id');
+    }
+    public function attr()
+    {
+        return $this->hasMany(ProductAttr::class,'product_id','product_id');
+    }
+    public function attrValue()
+    {
+        return $this->hasMany(ProductAttrValue::class,'product_id','product_id');
+    }
+    public function oldAttrValue()
+    {
+        return $this->hasMany(ProductAttrValue::class,'product_id','old_product_id');
+    }
+    public function content()
+    {
+        return $this->hasOne(ProductContent::class,'product_id','product_id');
+    }
+    protected function temp()
+    {
+        return $this->hasOne(ShippingTemplate::class,'shipping_template_id','temp_id');
+    }
+    public function storeCategory()
+    {
+        return $this->hasOne(StoreCategory::class,'store_category_id','cate_id')->field('store_category_id,cate_name');
+    }
+    public function merchant()
+    {
+        return $this->hasOne(Merchant::class,'mer_id','mer_id')->field('is_trader,type_id,mer_id,mer_name,mer_avatar,product_score,service_score,postage_score,service_phone,care_count');
+    }
+    public function reply()
+    {
+        return $this->hasMany(ProductReply::class,'product_id','product_id')->order('create_time DESC');
+    }
+    public function brand()
+    {
+        return $this->hasOne(StoreBrand::class,'brand_id','brand_id')->field('brand_id,brand_name');
+    }
+    public function seckillActive()
+    {
+        return $this->hasOne(StoreSeckillActive::class,'product_id','product_id');
+    }
+    public function issetCoupon()
+    {
+        return $this->hasOne(StoreCouponProduct::class, 'product_id', 'product_id')->alias('A')
+            ->rightJoin('StoreCoupon B', 'A.coupon_id = B.coupon_id')->where(function (BaseQuery $query) {
+                $query->where('B.is_limited', 0)->whereOr(function (BaseQuery $query) {
+                    $query->where('B.is_limited', 1)->where('B.remain_count', '>', 0);
+                });
+            })->where(function (BaseQuery $query) {
+                $query->where('B.is_timeout', 0)->whereOr(function (BaseQuery $query) {
+                    $time = date('Y-m-d H:i:s');
+                    $query->where('B.is_timeout', 1)->where('B.start_time', '<', $time)->where('B.end_time', '>', $time);
+                });
+            })->field('A.product_id,B.*')->where('status', 1)->where('type', 1)->where('send_type', 0)->where('is_del', 0)
+            ->order('sort DESC,coupon_id DESC')->hidden(['is_del', 'status']);
+    }
+    public function assist()
+    {
+        return $this->hasOne(ProductAssist::class,'product_id','product_id');
+    }
+    public function productGroup()
+    {
+        return $this->hasOne(ProductGroup::class,'product_id','product_id');
+    }
+    public function guarantee()
+    {
+        return $this->hasOne(GuaranteeTemplate::class,'guarantee_template_id','guarantee_template_id')->where('status',1)->where('is_del',0);
+    }
+
+
+    /**
+     * TODO 是否是会员
+     * @return bool
+     * @author Qinii
+     * @day 2023/1/4
+     */
+    public function getIsVipAttr()
+    {
+        if (request()->isLogin()) {
+            if (request()->userType() == 1) {
+                $userInfo = request()->userInfo();
+                return $userInfo->is_svip ? true : false;
+            } else {
+                return true;
+            }
+        }
+        return  false;
+    }
+    /**
+     * TODO 是否展示会员价
+     * @return bool
+     * @author Qinii
+     * @day 2023/1/4
+     */
+    public function getShowSvipPriceAttr()
+    {
+        if ($this->mer_svip_status != 0 && (systemConfig('svip_show_price') != 1 || $this->is_vip) && $this->svip_price_type > 0 ) {
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * TODO 是否显示会员价等信息
+     * @return array
+     * @author Qinii
+     * @day 2022/11/24
+     */
+    public function getShowSvipInfoAttr()
+    {
+        $res = [
+            'show_svip' => true, //是否展示会员入口
+            'is_svip' => false,  //当前用户是否是会员
+            'show_svip_price' => false, //是否展示会员价
+            'save_money' => 0, //当前商品会员优化多少钱
+        ];
+        if ($this->product_type == 0) {
+            if (!systemConfig('svip_switch_status')) {
+                $res['show_svip'] = false;
+            } else {
+                $res['is_svip'] = $this->is_vip;
+                if ($this->show_svip_price) {
+                    $res['show_svip_price'] = true;
+                    $res['save_money'] = bcsub($this->price, $this->svip_price, 2);
+                }
+            }
+        }
+        return  $res;
+    }
+
+    /**
+     * TODO 获取会员价
+     * @return int|string
+     * @author Qinii
+     * @day 2023/1/4
+     */
+    public function getSvipPriceAttr()
+    {
+        if ($this->product_type == 0 && $this->mer_svip_status != 0 && $this->show_svip_price) {
+            //默认比例
+            if ($this->svip_price_type == 1) {
+                $rate = merchantConfig($this->mer_id,'svip_store_rate');
+                $svip_store_rate = $rate > 0 ? bcdiv($rate,100,2) : 0;
+                $price = $this->attrValue()->order('price ASC')->value('price');
+                return bcmul($price,$svip_store_rate,2);
+            }
+            //自定义
+            if ($this->svip_price_type == 2) {
+                return $this->getData('svip_price');
+            }
+        }
+        return 0;
+    }
+
+
+    /*
+     * -----------------------------------------------------------------------------------------------------------------
+     * 搜索器
+     * -----------------------------------------------------------------------------------------------------------------
+     */
+    public function searchMerCateIdAttr($query, $value)
+    {
+        $cate_ids = (StoreCategory::where('path','like','%/'.$value.'/%'))->column('store_category_id');
+        $cate_ids[] = intval($value);
+        $product_id = ProductCate::whereIn('mer_cate_id',$cate_ids)->column('product_id');
+        $query->whereIn('Product.product_id',$product_id);
+    }
+    public function searchKeywordAttr($query, $value)
+    {
+        if (!$value) return;
+        if (is_numeric($value)) {
+            $query->whereLike("Product.store_name|Product.keyword|bar_code|Product.product_id", "%{$value}%");
+        } else {
+            $word = app()->make(VicWordService::class)->getWord($value);
+            $query->where(function ($query) use ($word, $value) {
+                foreach ($word as $item) {
+                    $query->whereOr('Product.store_name|Product.keyword', 'LIKE', "%$item%");
+                }
+                $query->order(Db::raw('REPLACE(Product.store_name,\'' . $value . '\',\'\')'));
+            });
+        }
+    }
+    public function searchStatusAttr($query, $value)
+    {
+        if($value === -1){
+            $query->where('Product.status', 'in',[-1,-2]);
+        }else {
+            $query->where('Product.status',$value);
+        }
+    }
+    public function searchCateIdAttr($query, $value)
+    {
+        $query->where('cate_id',$value);
+    }
+    public function searchCateIdsAttr($query, $value)
+    {
+        $query->whereIn('cate_id',$value);
+    }
+    public function searchIsShowAttr($query, $value)
+    {
+        $query->where('is_show',$value);
+    }
+    public function searchPidAttr($query, $value)
+    {
+        $cateId = app()->make(StoreCategoryRepository::class)->allChildren(intval($value));
+        $query->whereIn('cate_id', $cateId);
+    }
+    public function searchStockAttr($query, $value)
+    {
+        $value ? $query->where('stock','<=', $value) :  $query->where('stock', $value);
+    }
+    public function searchIsNewAttr($query, $value)
+    {
+        $query->where('is_new',$value);
+    }
+    public function searchPriceAttr($query, $value)
+    {
+        if(empty($value[0]) && !empty($value[1]))
+            $query->where('price','<',$value[1]);
+        if(!empty($value[0]) && empty($value[1]))
+            $query->where('price','>',$value[0]);
+        if(!empty($value[0]) && !empty($value[1]))
+            $query->whereBetween('price',[$value[0],$value[1]]);
+    }
+    public function searchBrandIdAttr($query, $value)
+    {
+        $query->whereIn('brand_id',$value);
+    }
+    public function searchIsGiftBagAttr($query, $value)
+    {
+        $query->where('is_gift_bag',$value);
+    }
+    public function searchIsGoodAttr($query, $value)
+    {
+        $query->where('is_good',$value);
+    }
+    public function searchIsUsedAttr($query, $value)
+    {
+        $query->where('is_used',$value);
+    }
+    public function searchProductTypeAttr($query, $value)
+    {
+        $query->where('Product.product_type',$value);
+    }
+    public function searchSeckillStatusAttr($query, $value)
+    {
+        $product_id = (new StoreSeckillActiveDao())->getStatus($value)->column('product_id');
+        $query->whereIn('Product.product_id',$product_id);
+    }
+    public function searchStoreNameAttr($query, $value)
+    {
+        $query->where('Product.store_name','like','%'.$value.'%');
+    }
+    public function searchMerStatusAttr($query, $value)
+    {
+        $query->where('mer_status',$value);
+    }
+    public function searchProductIdAttr($query, $value)
+    {
+        $query->where('Product.product_id',$value);
+    }
+    public function searchPriceOnAttr($query, $value)
+    {
+        $query->where('price','>=',$value);
+    }
+    public function searchPriceOffAttr($query, $value)
+    {
+        $query->where('price','<=',$value);
+    }
+    public function searchisFictiAttr($query, $value)
+    {
+        $query->where('type',$value);
+    }
+    public function searchGuaranteeTemplateIdAttr($query, $value)
+    {
+        $query->whereIn('guarantee_template_id',$value);
+    }
+    public function searchTempIdAttr($query, $value)
+    {
+        $query->whereIn('Product.temp_id',$value);
+    }
+}
diff --git a/app/admin/model/store/ProductCate.php b/app/admin/model/store/ProductCate.php
new file mode 100644
index 0000000..a9d07d6
--- /dev/null
+++ b/app/admin/model/store/ProductCate.php
@@ -0,0 +1,32 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+namespace app\admin\model\store;
+
+use think\Model;
+use app\admin\model\StoreCategory;
+
+class ProductCate extends Model
+{
+    protected $connection = 'shop';
+    protected $table = 'store_product_cate';
+
+    public function category()
+    {
+        return $this->hasOne(StoreCategory::class,'store_category_id','mer_cate_id')->field('store_category_id,cate_name');
+    }
+
+    public function searchProductIdAttr($query, $value)
+    {
+        $query->where('product_id',$value);
+    }
+}