商品分类-取消硬编码

app/common/repositories/store/StoreCategoryRepository.php

@@ -94,7 +94,8 @@ class StoreCategoryRepository extends BaseRepository
      */
     public function getList()
     {
-        $menus = $this->dao->getAllOptions(0);
+        //$menus = $this->dao->getAllOptions(0);取消硬编码
+        $menus = $this->dao->getAllOptions( $this->request->merId());
         $menus = formatCascaderData($menus, 'cate_name', 3);
         return $menus;
     }

app/common/repositories/store/product/ProductRepository.php

@@ -1239,7 +1239,7 @@ class ProductRepository extends BaseRepository
                 'ot_price' => set_price_rtrim($value['ot_price']),
                 'unique'   => $value['unique'],
                 'dacang'   => $value['dacang_price'] ? set_price_rtrim($value['dacang_price']) : 'null',
-                'is_usable' => $value['is_usable'],
+                'is_usable' => $value['is_usable'],//是否启用
             ];
             if ($productType) {
                 $sku[$value['sku']]['stock'] = $value['stock'] - $make->seckillSkuOrderCounut($value['unique']); //获取sku的销量

crmeb/traits/CategoresDao.php

@@ -224,7 +224,8 @@ trait CategoresDao
     {
         $field = $this->getParentId().',cate_name';
         return ($this->getModel()::getDB())->when(($mer_id !== null),function($query)use($mer_id){
-            $query->where('mer_id', $mer_id);
+            $query->whereIn('mer_id', ['0', $mer_id]);//加上原本0的商品分类
+//            $query->where('mer_id', $mer_id);
         })->when($status,function($query)use($status){
             $query->where($this->getStatus(),$status);
         })->when(($level !== null),function($query)use($level){