shish 5 gadi atpakaļ
vecāks
revīzija
155e84add9

+ 34 - 0
app-hd/controllers/ProductController.php

@@ -6,6 +6,7 @@
 
 namespace hd\controllers;
 
+use biz\ghs\classes\GhsClass;
 use bizGhs\admin\classes\AdminClass;
 use bizGhs\item\classes\ItemClass;
 use bizGhs\item\classes\ItemClassClass;
@@ -107,4 +108,37 @@ class ProductController extends BaseController
 
     }
 
+    //从零售端采购入库,查看供货商的某个门店的product
+    public function actionGhsItem()
+    {
+        $get = Yii::$app->request->get();
+        $id = $get['id'] ?? 0;
+        $ghs = GhsClass::getGhsInfo($id);
+        if(empty($ghs)){
+            util::fail('供货商无效');
+        }
+        $shopId = $ghs['ghsShopId']??0;
+        $sjId = $ghs['ghsSjId']??0;
+        AdminClass::addRecentShop($shopId,$this->admin);
+        //获取所有当前供应商的分类 (全部、常用)
+        //根据分类组装分类下的花材信息
+        $classIds = ItemClassClass::getGhsItemClassAll($sjId);
+        $where['merchantId'] = $sjId;
+        $where['shopId'] = $shopId;
+
+        $itemInfoData = ProductClass::getAllByCondition($where,null,"*");
+        $itemInfoData = ProductClass::groupProductInfo($itemInfoData);
+        //常用的itemIds
+        $oftenItemIds = ProductClass::getOftenItemIds($shopId);
+        //获取供应商下所有花材ID (itemIds)
+        $itemIdsInfo = ItemService::getGhsItemIds($this->sjId);
+
+        //dd($itemInfoData);
+        //组装数据: [{classId:'','className:'',child:[{itemInfoData}]}]
+        $data = ProductService::assembleData($classIds, $itemIdsInfo,$itemInfoData, $oftenItemIds, '');
+
+        util::success($data);
+    }
+
+
 }

+ 4 - 0
app-hd/controllers/PxClassController.php

@@ -16,6 +16,10 @@ class PxClassController extends BaseController
 	public function actionList()
 	{
 		$sjId = $this->sjId;
+		$where = ['sjId'=>$sjId];
+        $respond = PxClassClass::getClassList($where);
+        util::success($respond);
+
 		$class = PxClassClass::getAllValidClass($sjId);
 		util::success(['list' => $class]);
 	}

+ 70 - 50
biz-hd/px/classes/PxClassClass.php

@@ -2,60 +2,80 @@
 
 namespace bizHd\px\classes;
 
+use common\components\imgUtil;
 use common\components\util;
 use Yii;
 use bizHd\base\classes\BaseClass;
 
 class PxClassClass extends BaseClass
 {
-	
-	public static $baseFile = '\bizHd\px\models\PxClass';
-	
-	//培训班信息 ssh 2021.3.17
-	public static function getClassInfo($id)
-	{
-		return self::getById($id);
-	}
-	
-	//取所有可用培训班 ssh 2021.3.17
-	public static function getAllValidClass($sjId)
-	{
-		$where = ['sjId' => $sjId, 'delStatus' => 0];
-		$class = self::getAllByCondition($where, 'inTurn desc', '*');
-		return $class;
-	}
-	
-	//培训班验证 ssh 2021.3.17
-	public static function valid($info, $sjId)
-	{
-		if (empty($info)) {
-			util::fail('没有找到培训班');
-		}
-		if ($info['delStatus'] == 1) {
-			util::fail('培训班已经删除');
-		}
-		if ($info['sjId'] == $sjId) {
-			return true;
-		}
-		util::fail('没有权限访问');
-	}
-	
-	//添加培训班 ssh 2021.3.18
-	public static function addClass($data)
-	{
-		return self::add($data);
-	}
-	
-	//修改门店 ssh 2021.3.19
-	public static function updateClass($id, $data)
-	{
-		return self::updateById($id, $data);
-	}
-	
-	//删除培训班 ssh 2021.3.19
-	public static function delClass($id)
-	{
-		self::updateById($id, ['delStatus' => 1]);
-	}
-	
+
+    public static $baseFile = '\bizHd\px\models\PxClass';
+
+    public static function getClassList($where)
+    {
+        $data = self::getList('*', $where, 'addTime DESC');
+        $data['list'] = self::groupBaseInfo($data['list']);
+        return $data;
+    }
+
+    //组合信息 shish 2021.4.13
+    public static function groupBaseInfo($list)
+    {
+        if (empty($list)) {
+            return $list;
+        }
+        foreach ($list as $key => $val) {
+            $list[$key]['cover'] = imgUtil::groupImg($val['cover']);
+        }
+        return $list;
+    }
+
+    //培训班信息 ssh 2021.3.17
+    public static function getClassInfo($id)
+    {
+        return self::getById($id);
+    }
+
+    //取所有可用培训班 ssh 2021.3.17
+    public static function getAllValidClass($sjId)
+    {
+        $where = ['sjId' => $sjId, 'delStatus' => 0];
+        $class = self::getAllByCondition($where, 'inTurn desc', '*');
+        return $class;
+    }
+
+    //培训班验证 ssh 2021.3.17
+    public static function valid($info, $sjId)
+    {
+        if (empty($info)) {
+            util::fail('没有找到培训班');
+        }
+        if ($info['delStatus'] == 1) {
+            util::fail('培训班已经删除');
+        }
+        if ($info['sjId'] == $sjId) {
+            return true;
+        }
+        util::fail('没有权限访问');
+    }
+
+    //添加培训班 ssh 2021.3.18
+    public static function addClass($data)
+    {
+        return self::add($data);
+    }
+
+    //修改门店 ssh 2021.3.19
+    public static function updateClass($id, $data)
+    {
+        return self::updateById($id, $data);
+    }
+
+    //删除培训班 ssh 2021.3.19
+    public static function delClass($id)
+    {
+        self::updateById($id, ['delStatus' => 1]);
+    }
+
 }