字段修改，代码调整

app/ghs/controllers/ItemInfoController.php

@@ -1,59 +0,0 @@
-<?php
-/**
- * User: admin
- * Date Time: 2021/1/15 20:36
- */
-
-namespace ghs\controllers;
-
-
-use bizGhs\item\classes\ItemClass;
-use bizGhs\item\classes\ItemClassClass;
-use bizGhs\item\classes\ItemInfoClass;
-use bizGhs\item\services\ItemInfoService;
-use bizGhs\item\services\ItemService;
-use common\components\util;
-use Yii;
-class ItemInfoController extends BaseController
-{
-
-
-    //开单时获取所有的分类花材信息
-    public function actionIndex()
-    {
-        $pyName = Yii::$app->request->get('pyName','');
-        //获取所有当前供应商的分类 （全部、常用）
-        //根据分类组装分类下的花材信息
-        $classIds = ItemClassClass::getGhsItemClassAll($this->merchantId);
-        //获取供应商下所有花材ID （itemIds）
-        $itemIdsInfo = ItemService::getGhsItemIds($this->merchantId);
-        $itemIds = array_column($itemIdsInfo,'itemId');
-        if($pyName){
-            $pyNameItemIds = ItemClass::getItemIdsByPyName($pyName);
-            $itemIds = array_intersect($itemIds,$pyNameItemIds);
-        }
-        $itemInfoData = ItemInfoClass::getItemInfoByItemIds($itemIds);
-        //常用的itemIds
-        $oftenItemIds = ItemInfoClass::getOftenItemIds($this->merchantId);
-
-        //组装数据： [{classId:'','className:'',child:[{itemInfoData}]}]
-        $data = ItemInfoService::assembleData($classIds,$itemIdsInfo,$itemInfoData,$oftenItemIds);
-
-        util::success($data);
-    }
-
-    public function actionList()
-    {
-        $classId = Yii::$app->request->get('classId',0);
-        $pyName = Yii::$app->request->get('pyName','');
-        $itemIds = ItemClass::getItemIdsByClassId($classId);
-        if($pyName){
-            $pyNameItemIds = ItemClass::getItemIdsByPyName($pyName);
-            $itemIds = array_intersect($itemIds,$pyNameItemIds);
-        }
-        $data = ItemInfoClass::getItemInfoByItemIds($itemIds);
-        util::success($data);
-    }
-
-    
-}

app/ghs/controllers/ProductController.php

@@ -21,15 +21,15 @@ class ProductController extends BaseController
     //开单时获取所有的分类花材信息
     public function actionIndex()
     {
-        $pyName = Yii::$app->request->get('pyName','');
+        $py = Yii::$app->request->get('py','');
         //获取所有当前供应商的分类 （全部、常用）
         //根据分类组装分类下的花材信息
         $classIds = ItemClassClass::getGhsItemClassAll($this->merchantId);
         //获取供应商下所有花材ID （itemIds）
         $itemIdsInfo = ItemService::getGhsItemIds($this->merchantId);
         $itemIds = array_column($itemIdsInfo,'itemId');
-        if($pyName){
-            $pyNameItemIds = ItemClass::getItemIdsByPyName($pyName);
+        if($py){
+            $pyNameItemIds = ItemClass::getItemIdsByPyName($py);
             $itemIds = array_intersect($itemIds,$pyNameItemIds);
         }
         $itemInfoData = ProductClass::getProductInfoByItemIds($itemIds);
@@ -42,6 +42,7 @@ class ProductController extends BaseController
         util::success($data);
     }
 
+    //弃用
     public function actionList()
     {
         $classId = Yii::$app->request->get('classId',0);

app/ghs/controllers/PurchaseOrderController.php

@@ -1,8 +1,10 @@
 <?php
 namespace ghs\controllers;
 
+use bizGhs\admin\classes\AdminClass;
 use bizGhs\order\classes\PurchaseOrderClass;
 use bizGhs\order\classes\PurchaseOrderItemClass;
+use bizGhs\product\classes\ProductClass;
 use common\components\util;
 use Yii;
 class PurchaseOrderController extends BaseController
@@ -21,22 +23,32 @@ class PurchaseOrderController extends BaseController
         if(empty($ghsItemInfo)){
             util::fail('请选择花材');
         }
-        $ghsItemInfo = json_decode($ghsItemInfo,true);
+        $ghsItemInfo = json_decode($ghsItemInfo,true); // [{productId:0,itemId:0,num:1,smallNum:0}]
         if(!is_array($ghsItemInfo)){
             util::fail('花材格式不正确');
         }
+
+        //判断花材格式，是否属于当前门店
+        $productIds = array_column($ghsItemInfo,'productId');
+
+        ProductClass::valid($productIds,$this->shopId);
+
         //判断花材里的信息
         foreach ($ghsItemInfo as $v){
             $itemId = $v['itemId']??0;
-            $bigNum = $v['bigNum']??0;
+            $num = $v['num']??0;
+            $productId = $v['productId']??0;
             $smallNum = $v['smallNum']??0;
-            $itemPrice = $v['itemPrice']??0;
-            if(!$itemId){
+            if(!isset($v['itemPrice'])){
+                util::fail('采购价格不能为空');
+            }
+            if(!$itemId || !$productId){
                 util::fail('花材不存在');
             }
-            if($bigNum <=0 && $smallNum <=0){
+            if($num <=0 && $smallNum <=0){
                 util::fail('花材数量不能为0');
             }
+
         }
         $post['itemInfo'] = $ghsItemInfo;
         $order = PurchaseOrderClass::addOrder($post);
@@ -58,7 +70,7 @@ class PurchaseOrderController extends BaseController
         $where['merchantId'] = $this->merchantId;
         $where['shopId'] = $this->shopId;
         $data = PurchaseOrderClass::getOrderList($where);
-        $data['list'] = PurchaseOrderClass::groupGhsInfo($data['list']);
+        $data['list'] = PurchaseOrderClass::groupSupplierInfo($data['list']);
         util::success($data);
     }
 

biz-ghs/base/classes/BaseClass.php

@@ -5,5 +5,8 @@ namespace bizGhs\base\classes;
 
 class BaseClass extends \biz\base\classes\BaseClass
 {
-
+    public static function groupImg($img)
+    {
+        return \Yii::$app->params['imgHost'].$img;
+    }
 }

biz-ghs/order/classes/CheckOrderClass.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace bizGhs\order\classes;
+
+use bizGhs\product\classes\ProductClass;
+use bizGhs\stock\services\StockRecordService;
+use common\components\util;
+use Yii;
+use bizGhs\base\classes\BaseClass;
+use common\services\xhItemService;
+class CheckOrderClass extends BaseClass
+{
+
+    public static $baseFile = '\bizGhs\order\models\CheckOrder';
+    const STATUS_COMPLETE = 1;
+
+
+    //添加
+    public static function addOrder($data)
+    {
+        $merchantId = $data['merchantId'];
+        $shopId = $data['shopId'];
+        $data['status'] = self::STATUS_COMPLETE;
+        $orderSn =self::generateOrderSn(self::CHECK_ORDER);
+        $data['orderSn'] = $orderSn;
+        $ghsItemInfo = $data['itemInfo']; // [{itemId:0,bigNum:0,smallNum:0,itemPrice:1.0}]
+        $bigNum = 0; //总共多少扎
+        $smallNum = 0; //总共多少支
+        $totalItemPrice = 0;
+        $itemIds = array_column($ghsItemInfo,'itemId');
+        $itemData = xhItemService::getByIds($itemIds);
+        $itemData = array_column($itemData, NULL, 'id');
+        if(!empty($ghsItemInfo)){
+            foreach ($ghsItemInfo as $v){
+                $bigNum += $v['bigNum'];
+                $smallNum += $v['smallNum'];
+                $totalItemPrice = bcadd($totalItemPrice,$v['itemPrice'],2);
+            }
+        }
+        $data['bigNum'] = $bigNum;
+        $data['smallNum'] = $smallNum;
+        $data['totalPrice'] = $totalItemPrice;
+        $connection = Yii::$app->db;
+        $transaction = $connection->beginTransaction();
+        try{
+            $order = self::add($data);
+            //写入详情表
+            $batchData = [];
+
+            foreach ($ghsItemInfo as $v){
+                $tmp = [];
+                $itemId = $v['itemId'];
+                $tmp['productId'] = $v['productId']??0;
+                $tmp['orderSn'] = $orderSn;
+                $tmp['itemId'] = $v['itemId'];
+                $unitNum = $itemData[$itemId]['unitNum']??0;
+                $tmp['itemNum'] = ProductClass::mergeItemNum($v['bigNum'],$v['smallNum'],$unitNum);
+                $tmp['itemPrice'] = $v['itemPrice'];
+                $itemInfo = [
+                    'itemName'=> $itemData[$itemId]['name']??'',
+                    'itemCover'=> $itemData[$itemId]['cover']??'',
+                    'bigNum'=> $v['bigNum'],
+                    'smallNum'=> $v['smallNum'],
+                    'itemUnit'=> $unitNum?2:1,
+                    'itemBigUnit'=> xhItemService::getUnitName($itemData[$v['itemId']]['bigUnit']??1),
+                    'itemSmallUnit'=> xhItemService::getUnitName($itemData[$v['itemId']]['smallUnit']??2),
+                ];
+                $tmp['itemInfo'] = json_encode($itemInfo);
+                $batchData[] = $tmp;
+            }
+            PurchaseOrderItemClass::batchAddOrderItem($batchData);
+            //现在暂时点击确定，完成 加库存
+            foreach ($batchData as $v){
+                $itemId = $v['itemId'];
+                $ghsItemInfoData = ProductClass::getGhsProductDataByItemId($shopId,$itemId);
+                $ghsItemInfoId = $ghsItemInfoData['id']??0;
+                if(!$ghsItemInfoId){
+                    $transaction->rollBack();
+                    util::fail('有商品不存在');
+                }
+                //流水记录
+                $record = [];
+                $record['merchantId'] = $merchantId;
+                $record['shopId'] = $shopId;
+                $record['orderSn'] = $orderSn;
+                $record['itemId'] = $itemId;
+                $record['itemNum'] = $v['itemNum'];
+                $record['oldStock'] = $ghsItemInfoData['stock'];
+                $record['newStock'] =  bcadd($ghsItemInfoData['stock'],$v['itemNum'],2);
+                StockRecordService::addPurchaseOrderRecord($record);
+                //加库存
+                ProductClass::addStockByItemNum($ghsItemInfoId,$v['itemNum']);
+            }
+            $transaction->commit();
+            return $order;
+
+        }catch (\Exception $exception){
+            $transaction->rollBack();
+            util::fail('保存失败');
+        }
+    }
+
+    public static function getOrderList($where)
+    {
+        $data = self::getList('*', $where, 'addTime DESC');
+        $list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
+        if (empty($list)) {
+            return $data;
+        }
+        $data['list'] = $list;
+        return $data;
+    }
+
+}

biz-ghs/order/classes/CheckOrderItemClass.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace bizGhs\order\classes;
+
+use Yii;
+use bizGhs\base\classes\BaseClass;
+
+class CheckOrderItemClass extends BaseClass
+{
+
+    public static $baseFile = '\bizGhs\order\models\CheckOrderItem';
+
+    public static function batchAddOrderItem($data)
+    {
+        self::batchAdd($data);
+    }
+    public static function getOrderItemDetail($orderSn)
+    {
+        return self::getAllByCondition(['orderSn'=>$orderSn],null,'*');
+    }
+}

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -5,6 +5,7 @@ namespace bizGhs\order\classes;
 use bizGhs\base\classes\BaseClass;
 use bizGhs\stock\services\StockRecordService;
 use bizGhs\product\classes\ProductClass;
+use common\components\orderSn;
 use common\components\util;
 use common\services\xhItemService;
 use Yii;
@@ -21,28 +22,33 @@ class PurchaseOrderClass extends BaseClass
 
     public static function addOrder($data)
     {
-        $date = date("Y-m-d H:i:s");
+
         $merchantId = $data['merchantId'];
         $shopId = $data['shopId'];
         $data['status'] = self::PURCHASE_ORDER_STATUS_COMPLETE;
         $orderSn = time();
         $data['orderSn'] = $orderSn;
-        $ghsItemInfo = $data['itemInfo']; // [{itemId:0,bigNum:0,smallNum:0,itemPrice:1.0}]
+        $ghsItemInfo = $data['itemInfo']; // [{itemId:0,num:0,smallNum:0,productId:1.0}]
         //计算出总共多少扎，多少支
-        $bigNum = 0; //总共多少扎
+        $num = 0; //总共多少扎
         $smallNum = 0; //总共多少支
         $totalItemPrice = 0;
         $itemIds = array_column($ghsItemInfo,'itemId');
         $itemData = xhItemService::getByIds($itemIds);
         $itemData = array_column($itemData, NULL, 'id');
+
+        $productIds = array_column($ghsItemInfo,'productId');
+        $productData = ProductClass::getProductByIds($productIds);
+        $productData =  array_column($productData, NULL, 'id');
+
         if(!empty($ghsItemInfo)){
             foreach ($ghsItemInfo as $v){
-                $bigNum += $v['bigNum'];
+                $num += $v['num'];
                 $smallNum += $v['smallNum'];
                 $totalItemPrice = bcadd($totalItemPrice,$v['itemPrice'],2);
             }
         }
-        $data['bigNum'] = $bigNum;
+        $data['num'] = $num;
         $data['smallNum'] = $smallNum;
         $data['totalPrice'] = $totalItemPrice;
 
@@ -74,17 +80,18 @@ class PurchaseOrderClass extends BaseClass
                 $itemId = $v['itemId'];
                 $tmp['orderSn'] = $orderSn;
                 $tmp['itemId'] = $v['itemId'];
+                $tmp['productId'] = $v['productId'];
                 $unitNum = $itemData[$itemId]['unitNum']??0;
-                $tmp['itemNum'] = ProductClass::mergeItemNum($v['bigNum'],$v['smallNum'],$unitNum);
+                $tmp['itemNum'] = ProductClass::mergeItemNum($v['num'],$v['smallNum'],$unitNum);
                 $tmp['itemPrice'] = $v['itemPrice'];
                 $itemInfo = [
                     'itemName'=> $itemData[$itemId]['name']??'',
                     'itemCover'=> $itemData[$itemId]['cover']??'',
-                    'bigNum'=> $v['bigNum'],
+                    'num'=> $v['num'],
                     'smallNum'=> $v['smallNum'],
-                    'itemUnit'=> $unitNum?2:1,
-                    'itemBigUnit'=> xhItemService::getUnitName($itemData[$v['itemId']]['bigUnit']),
-                    'itemSmallUnit'=> xhItemService::getUnitName($itemData[$v['itemId']]['smallUnit']),
+                    'unitCount'=> $unitNum?2:1,
+                    'unit'=> xhItemService::getUnitName($itemData[$v['itemId']]['bigUnit']),
+                    'smallUnit'=> xhItemService::getUnitName($itemData[$v['itemId']]['smallUnit']),
                 ];
                 $tmp['itemInfo'] = json_encode($itemInfo);
                 $batchData[] = $tmp;
@@ -94,12 +101,7 @@ class PurchaseOrderClass extends BaseClass
             //现在暂时点击确定，完成 加库存
             foreach ($batchData as $v){
                 $itemId = $v['itemId'];
-                $ghsItemInfoData = ProductClass::getGhsProductDataByItemId($shopId,$itemId);
-                $ghsItemInfoId = $ghsItemInfoData['id']??0;
-                if(!$ghsItemInfoId){
-                    $transaction->rollBack();
-                    util::fail('有商品不存在');
-                }
+                $productId = $v['productId'];
                 //流水记录
                 $record = [];
                 $record['merchantId'] = $merchantId;
@@ -107,11 +109,11 @@ class PurchaseOrderClass extends BaseClass
                 $record['orderSn'] = $orderSn;
                 $record['itemId'] = $itemId;
                 $record['itemNum'] = $v['itemNum'];
-                $record['oldStock'] = $ghsItemInfoData['stock'];
-                $record['newStock'] =  bcadd($ghsItemInfoData['stock'],$v['itemNum'],2);
+                $record['oldStock'] = $productData[$productId]['stock'];
+                $record['newStock'] =  bcadd($productData[$productId]['stock'],$v['itemNum'],2);
                 StockRecordService::addPurchaseOrderRecord($record);
                 //加库存
-                ProductClass::addStockByItemNum($ghsItemInfoId,$v['itemNum']);
+                ProductClass::addStockByItemNum($productId,$v['itemNum']);
             }
             $transaction->commit();
             return $order;
@@ -134,13 +136,13 @@ class PurchaseOrderClass extends BaseClass
     }
 
 
-    //供应商信息
-    public static function groupGhsInfo($list){
+    //增加供应商信息
+    public static function groupSupplierInfo($list){
         foreach ($list as $k=>$v){
             $supplierId = $v['supplierId'];
             $gysInfo = self::getGysInfo($supplierId);
-            $list[$k]['upName'] = $gysInfo['upName'];
-            $list[$k]['upCover'] = $gysInfo['upCover'];
+            $list[$k]['upName'] = $gysInfo['upName']??'';
+            $list[$k]['upCover'] = $gysInfo['upCover']??'';
         }
         return $list;
     }
@@ -161,8 +163,10 @@ class PurchaseOrderClass extends BaseClass
             foreach ($orderInfo as $v) {
                 $info = json_decode($v['itemInfo'],true);
                 $tmp = $info;
+                $tmp['productId'] = $v['productId'];
                 $tmp['itemId'] = $v['itemId'];
                 $tmp['itemPrice'] = $v['itemPrice'];
+                $tmp['itemCover'] = self::groupImg($info['itemCover']);
                 $itemData[] = $tmp;
             }
         }

biz-ghs/order/models/CheckOrder.php

@@ -0,0 +1,12 @@
+<?php
+namespace bizGhs\order\models;
+use bizGhs\base\models\Base;
+
+class CheckOrder extends Base
+{
+    public static function tableName()
+    {
+        return 'xhGhsCheckOrder';
+    }
+
+}

biz-ghs/order/models/CheckOrderItem.php

@@ -0,0 +1,12 @@
+<?php
+namespace bizGhs\order\models;
+use bizGhs\base\models\Base;
+
+class CheckOrderItem extends Base
+{
+    public static function tableName()
+    {
+        return 'xhGhsCheckOrderItem';
+    }
+
+}

biz-ghs/order/services/CheckOrderItemService.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace bizGhs\order\services;
+
+use bizGhs\base\services\BaseService;
+use Yii;
+
+class CheckOrderItemService extends BaseService
+{
+
+    public static $baseFile = '\bizGhs\order\classes\CheckOrderItemClass';
+
+}

biz-ghs/order/services/CheckOrderService.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace bizGhs\order\services;
+
+use bizGhs\base\services\BaseService;
+use Yii;
+
+class CheckOrderService extends BaseService
+{
+
+    public static $baseFile = '\bizGhs\order\classes\CheckOrderClass';
+
+}

biz-ghs/product/classes/ProductClass.php

@@ -10,9 +10,9 @@ use common\services\xhItemService;
 
 class ProductClass extends BaseClass
 {
-	
+
 	public static $baseFile = '\bizGhs\product\models\Product';
-	
+
 	//根据itemIds获取相应的花材信息
 	public static function getProductInfoByItemIds(array $itemIds)
 	{
@@ -21,7 +21,7 @@ class ProductClass extends BaseClass
 		$data = self::groupItemBaseInfo($data);
 		return $data;
 	}
-	
+
 	//根据花材ID，获取花材名称，图片
 	public static function groupItemBaseInfo($list)
 	{
@@ -37,24 +37,24 @@ class ProductClass extends BaseClass
 				$unitNum = $data[$v['itemId']]['unitNum']??0;
 				$stockInfo = self::formatStock($v['stock'], $unitNum);
 				$list[$k]['cover'] = $coverInfo['coverUrl'];
-				$list[$k]['bigNum'] = $stockInfo['bigNum'];
+				$list[$k]['num'] = $stockInfo['num'];
 				$list[$k]['smallNum'] = $stockInfo['smallNum'];
 				$list[$k]['itemName'] = $data[$v['itemId']]['name']??'';
 				$list[$k]['unitCount'] = $unitNum ? 2 : 1;
-				$list[$k]['bigUnit'] = xhItemService::getUnitName($data[$v['itemId']]['bigUnit']);
+				$list[$k]['unit'] = xhItemService::getUnitName($data[$v['itemId']]['bigUnit']);
 				$list[$k]['smallUnit'] = xhItemService::getUnitName($data[$v['itemId']]['smallUnit']);
 			}
 		}
 		return $list;
 	}
-	
+
 	//根据花材ID，库存=》  计算出多少扎，多少支
 	public static function formatStockByItemId($itemId, $stock)
 	{
 		$unitNum = xhItemService::getItemUnitNum($itemId);
 		return self::formatStock($stock, $unitNum);
 	}
-	
+
 	//花材的库存转换: 库存是小数，根据各个花材的unitNum， 计算出多少扎，多少支
 	public static function formatStock($stock, $unitNum)
 	{
@@ -65,29 +65,43 @@ class ProductClass extends BaseClass
 			$stockPiece = bcdiv(bcmul($stockArr[1], $unitNum, 1), 100);
 		}
 		return [
-			'bigNum' => $stockBundle,
+			'num' => $stockBundle,
 			'smallNum' => (int)$stockPiece,
 		];
 	}
-	
-	public static function mergeItemNumByItemId($itemNumBundle, $itemNumPiece, $itemId)
+
+    /**
+     * 根据 花材ID，将花材大小数量 换算成小数
+     * @param $num 大单位 数量
+     * @param $smallNum 小单位 数量
+     * @param $itemId  花材ID
+     * @return string
+     */
+	public static function mergeItemNumByItemId($num, $smallNum, $itemId)
 	{
 		$unitNum = xhItemService::getItemUnitNum($itemId);
-		return self::mergeItemNum($itemNumBundle, $itemNumPiece, $unitNum);
+		return self::mergeItemNum($num, $smallNum, $unitNum);
 	}
-	
-	//花材扎、支 转换  统一数
-	public static function mergeItemNum($itemNumBundle, $itemNumPiece, $unitNum)
+
+	//花材扎、支 合并转换 小数
+
+    /**
+     * @param $num  大单位 数量
+     * @param $smallNum  小单位 数量
+     * @param $unitNum  花材比例
+     * @return string
+     */
+	public static function mergeItemNum($num, $smallNum, $unitNum)
 	{
 		$stockDecimal = 0;
 		if ($unitNum > 0) {
-			$stockDecimal = bcdiv($itemNumPiece, $unitNum, 2);
+			$stockDecimal = bcdiv($smallNum, $unitNum, 2);
 		}
-		$itemNum = bcadd($itemNumBundle, $stockDecimal, 2);
+		$itemNum = bcadd($num, $stockDecimal, 2);
 		return $itemNum;
 	}
-	
-	
+
+
 	//获取常用的itemIds
 	public static function getOftenItemIds($merchantId)
 	{
@@ -97,11 +111,11 @@ class ProductClass extends BaseClass
 		}
 		return $data;
 	}
-	
-	
-	
+
+
+
 	//加库存，允许负库存，负数数量（盘点时）
-	
+
 	/**
 	 * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
 	 * @param $itemNumBundle  花材数量（扎）
@@ -122,8 +136,15 @@ class ProductClass extends BaseClass
 		self::updateById($productId, ['stock' => $newStock]);
 		return true;
 	}
-	
-	//根据数量加库存
+
+
+
+    /**
+     * 对商品ID 加库存
+     * @param $productId  商品ID
+     * @param $itemNum  数量
+     * @return bool
+     */
 	public static function addStockByItemNum($productId, $itemNum)
 	{
 		$productData = self::getById($productId, true);
@@ -135,9 +156,9 @@ class ProductClass extends BaseClass
 		$productData->save();
 		return true;
 	}
-	
+
 	//减库存,允许负库存，负数数量（盘点时）
-	
+
 	/**
 	 * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
 	 * @param $itemNumBundle  花材数量（扎）
@@ -159,8 +180,8 @@ class ProductClass extends BaseClass
 		$productData->save();
 		return true;
 	}
-	
-	
+
+
 	//根据数量加库存
 	public static function decreaseStockByItemNum($productId, $itemNum)
 	{
@@ -172,9 +193,9 @@ class ProductClass extends BaseClass
 		self::updateById($productId, ['stock' => $newStock]);
 		return true;
 	}
-	
+
 	//计算价格
-	
+
 	/**
 	 * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
 	 * @param $itemNumBundle  花材数量（扎）
@@ -199,11 +220,11 @@ class ProductClass extends BaseClass
 			$piecePrice = bcmul($unitPrice, $itemNumPiece, 2);
 		}
 		$bundlePrice = bcmul($price, $itemNumBundle, 2);
-		
+
 		$total = bcadd($bundlePrice, $piecePrice, 2);
 		return $total;
 	}
-	
+
 	//根据门店ID, 平台花材ID， 获取门店的花材ID
 	public static function getGhsProductId($shopId, $itemId)
 	{
@@ -213,7 +234,7 @@ class ProductClass extends BaseClass
 		}
 		return 0;
 	}
-	
+
 	public static function getGhsProductDataByItemId($shopId, $itemId)
 	{
 		$where = [
@@ -223,7 +244,7 @@ class ProductClass extends BaseClass
 		$data = self::getByCondition($where);
 		return $data;
 	}
-	
+
 	//有效花材判断，包括id有效、同个门店等 shish 2021.1.19
 	public static function valid($ids, $shopId)
 	{
@@ -238,7 +259,14 @@ class ProductClass extends BaseClass
 			if (count($productList) != count($ids)) {
 				util::fail('存在无效商品');
 			}
-		}
+		}else{
+            util::fail('商品不存在');
+        }
 	}
-	
+
+	//通过ids 批量获取花材商品的信息
+    public static function getProductByIds($ids)
+    {
+        return self::getByIds($ids);
+    }
 }

sql.sql

@@ -721,3 +721,9 @@ ALTER TABLE `xhPurchaseItem` CHANGE `price` `totalPrice` DECIMAL(10,2) NOT NULL
 ALTER TABLE `xhPurchaseItem` CHANGE `bigPrice` `price` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '大单位价，每扎价、每包价、每箱价';
 ALTER  TABLE xhPurchaseItem MODIFY `totalPrice` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '总价';
 ALTER TABLE xhGhsOrderItem ADD totalPrice DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '总价' AFTER `price`;
+
+===
+==linqh  21-01-19
+ALTER TABLE `xhGhsPurchaseOrder`
+CHANGE COLUMN `bigNum` `num`  int(11) NOT NULL DEFAULT 0 COMMENT '合计多少商品(大单位 -扎)' AFTER `supplierId`,
+CHANGE COLUMN `totalPrice` `price`  decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT '商品总价格' AFTER `smallNum`;