Merge branch 'master' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong

app/store/model/Goods.php

@@ -19,7 +19,7 @@ use app\common\enum\goods\Status as GoodsStatusEnum;
 use cores\exception\BaseException;
 use app\common\model\Region;
 use think\facade\Db;
-
+use app\common\model\Store as StoreModel;
 /**
  * 商品模型
  * Class Goods
@@ -298,6 +298,18 @@ class Goods extends GoodsModel
         return $this->where($where)->where('is_delete', '=', 0)->count();
     }
 
+        /**
+     * 获取当前商品已上架总数
+     * @param array $where
+     * @return int
+     */
+    public function getGoodsGroundingTotal(array $where = []): int
+    {   
+        $detail = StoreModel::where('status',1)->find();
+        $list = $this->where($where)->where('is_delete', '=', 0)->whereIn('channel',$detail['open_channel'])->where('status','=',10)->count();
+        return $list;
+    }
+
     /**
      * 创建商品数据
      * @param array $data

app/store/service/Home.php

@@ -87,6 +87,8 @@ class Home extends BaseService
             'statistics' => [
                 // 商品总数量
                 'goodsTotal' => $this->getGoodsTotal(),
+                //上架商品总数
+                'getGoodsGroundingTotal' => $this->getGoodsGroundingTotal(),
                 // 会员总人数
                 'userTotal' => $this->getUserTotal(),
                 // 付款订单总量
@@ -137,6 +139,14 @@ class Home extends BaseService
     {
         return number_format($this->GoodsModel->getGoodsTotal());
     }
+    /**
+     * 获取商品已上架总量
+     * @return string
+     */
+    private function getGoodsGroundingTotal(): string
+    {
+        return number_format($this->GoodsModel->getGoodsGroundingTotal());
+    }
 
     /**
      * 会员总人数