Merge branch 'linqh-dev'

# Conflicts:
#	sql.sql

app/ghs/controllers/ItemClassController.php

@@ -16,7 +16,7 @@ class ItemClassController extends BaseController
 
     public function actionList()
     {
-        $where = ['ghsId' => $this->ghsId];
+        $where = ['merchantId' => $this->ghsId];
         $list = ItemClassClass::getGhsItemClassList($where);
         util::success($list);
     }
@@ -34,7 +34,7 @@ class ItemClassController extends BaseController
         $data = Yii::$app->request->post();
 
         $data['adminId'] = $this->adminId;
-        $data['ghsId'] = $this->ghsId;
+        $data['merchantId'] = $this->ghsId;
         ItemClassClass::updateGhsItemClass($data);
         util::complete('修改成功');
     }

app/ghs/controllers/ItemController.php

@@ -13,7 +13,7 @@ class ItemController extends BaseController
     {
         //classId
         $classId = Yii::$app->request->get('classId',0);
-        $where['ghsId'] =  $this->ghsId;
+        $where['merchantId'] =  $this->ghsId;
         $where['classId'] =  $classId;
         $list = ItemClass::getGhsItemList($where);
         util::success($list);
@@ -24,7 +24,7 @@ class ItemController extends BaseController
         $post = Yii::$app->request->post();
         $post['adminId'] = $this->adminId;
         $post['shopId'] = $this->shopId;
-        $post['ghsId'] = $this->ghsId;
+        $post['merchantId'] = $this->ghsId;
         ItemService::addGhsItem($post);
         util::complete('添加成功');
     }
@@ -33,7 +33,7 @@ class ItemController extends BaseController
     {
         $data = Yii::$app->request->post();
         $data['adminId'] = $this->adminId;
-        $data['ghsId'] = $this->ghsId;
+        $data['merchantId'] = $this->ghsId;
         ItemService::updateGshItem($data);
         util::complete('修改成功');
     }

app/ghs/controllers/ProductController.php

@@ -0,0 +1,59 @@
+<?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\product\classes\ProductClass;
+use bizGhs\product\services\ProductService;
+use bizGhs\item\services\ItemService;
+use common\components\util;
+use Yii;
+class ProductController extends BaseController
+{
+
+
+    //开单时获取所有的分类花材信息
+    public function actionIndex()
+    {
+        $pyName = Yii::$app->request->get('pyName','');
+        //获取所有当前供应商的分类 （全部、常用）
+        //根据分类组装分类下的花材信息
+        $classIds = ItemClassClass::getGhsItemClassAll($this->ghsId);
+        //获取供应商下所有花材ID （itemIds）
+        $itemIdsInfo = ItemService::getGhsItemIds($this->ghsId);
+        $itemIds = array_column($itemIdsInfo,'itemId');
+        if($pyName){
+            $pyNameItemIds = ItemClass::getItemIdsByPyName($pyName);
+            $itemIds = array_intersect($itemIds,$pyNameItemIds);
+        }
+        $itemInfoData = ProductClass::getProductInfoByItemIds($itemIds);
+        //常用的itemIds
+        $oftenItemIds = ProductClass::getOftenItemIds($this->ghsId);
+
+        //组装数据： [{classId:'','className:'',child:[{itemInfoData}]}]
+        $data = ProductService::assembleData($classIds,$itemIdsInfo,$itemInfoData,$oftenItemIds);
+
+        util::success($data);
+    }
+
+    public function actionList()
+    {
+        $classId = Yii::$app->request->get('classId',0);
+        $pyName = Yii::$app->request->get('py','');
+        $itemIds = ItemClass::getItemIdsByClassId($classId);
+        if($pyName){
+            $pyNameItemIds = ItemClass::getItemIdsByPyName($pyName);
+            $itemIds = array_intersect($itemIds,$pyNameItemIds);
+        }
+        $data = ProductClass::getProductInfoByItemIds($itemIds);
+        util::success($data);
+    }
+
+
+}

app/ghs/controllers/PurchaseOrderController.php

@@ -12,7 +12,7 @@ class PurchaseOrderController extends BaseController
     public function actionCreateOrder()
     {
         $post = Yii::$app->request->post();
-        $post['ghsId'] = $this->ghsId;
+        $post['merchantId'] = $this->ghsId;
         $post['shopId'] = $this->shopId;
         $post['adminId'] = $this->adminId;
 
@@ -28,13 +28,13 @@ class PurchaseOrderController extends BaseController
         //判断花材里的信息
         foreach ($ghsItemInfo as $v){
             $itemId = $v['itemId']??0;
-            $itemNumBundle = $v['itemNumBundle']??0;
-            $itemNumPiece = $v['itemNumPiece']??0;
+            $bigNum = $v['bigNum']??0;
+            $smallNum = $v['smallNum']??0;
             $itemPrice = $v['itemPrice']??0;
             if(!$itemId){
                 util::fail('花材不存在');
             }
-            if($itemNumPiece <=0 && $itemNumBundle <=0){
+            if($bigNum <=0 && $smallNum <=0){
                 util::fail('花材数量不能为0');
             }
         }
@@ -55,7 +55,7 @@ class PurchaseOrderController extends BaseController
         if($orderStatus){
             $where['orderStatus'] = $orderStatus;
         }
-        $where['ghsId'] = $this->ghsId;
+        $where['merchantId'] = $this->ghsId;
         $where['shopId'] = $this->shopId;
         $data = PurchaseOrderClass::getOrderList($where);
         $data['list'] = PurchaseOrderClass::groupGhsInfo($data['list']);

biz-ghs/item/classes/ItemClass.php

@@ -71,10 +71,10 @@ class ItemClass extends BaseClass
     }
 
     //获取当前供应商下的所有item
-    public static function getGhsItemAll($ghsId,$select="*")
+    public static function getGhsItemAll($merchantId,$select="*")
     {
         $where = [
-            'ghsId'=>$ghsId
+            'merchantId'=>$merchantId
         ];
         $data = self::getAllList($select,$where);
         return $data;

biz-ghs/item/classes/ItemClassClass.php

@@ -30,19 +30,19 @@ class ItemClassClass extends BaseClass
     }
 
     //新增花材分类
-    public static function addGhsItemClass($ghsId,$data)
+    public static function addGhsItemClass($merchantId,$data)
     {
-        if(!$ghsId){
+        if(!$merchantId){
             util::fail("请选择供应商");
         }
-        $data['ghsId'] = $ghsId;
+        $data['merchantId'] = $merchantId;
         $name = $data['name']??'';
         if(!$name){
             util::fail("请输入花材分类");
         }
 
         //判断花材名称是否存在（当前ghsId下）
-        $exist = self::exists(['ghsId'=>$ghsId,'name'=>$name]);
+        $exist = self::exists(['merchantId'=>$merchantId,'name'=>$name]);
         if($exist){
             util::fail("花材分类名称已存在");
         }
@@ -62,7 +62,7 @@ class ItemClassClass extends BaseClass
     public static function updateGhsItemClass($data)
     {
         $id = $data['id']??0;
-        $ghsId = $data['ghsId']??0;
+        $ghsId = $data['merchantId']??0;
         $name = $data['name']??'';
         if(!$ghsId){
             util::fail("请选择供应商");
@@ -80,10 +80,10 @@ class ItemClassClass extends BaseClass
     }
 
     //获取开单页所有的分类：包括全部、常用
-    public static function getGhsItemClassAll($ghsId)
+    public static function getGhsItemClassAll($merchantId)
     {
         $where = [
-            'ghsId'=>$ghsId
+            'merchantId'=>$merchantId
         ];
         $data = self::getAllList('id,name',$where,'inTurn desc');
         $all = [

biz-ghs/item/models/ItemInfo.php

@@ -1,14 +0,0 @@
-<?php
-/**
- * User: admin
- * Date Time: 2021/1/13 14:13
- */
-namespace bizGhs\item\models;
-use bizGhs\base\models\Base;
-class ItemInfo extends Base
-{
-    public static function tableName()
-    {
-        return 'xhGhsItemInfo';
-    }
-}

biz-ghs/item/services/ItemClassService.php

@@ -24,7 +24,7 @@ class ItemClassService extends BaseService
         if(!$model){
             util::fail("该花材分类不存在");
         }
-        $exist = ItemClass::exists(['classId'=>$id,'ghsId'=>$model['ghsId']]);
+        $exist = ItemClass::exists(['classId'=>$id,'merchantId'=>$model['merchantId']]);
         if($exist){
             util::fail("该花材分类还有花材，不能删除");
         }

biz-ghs/item/services/ItemService.php

@@ -9,7 +9,7 @@ namespace bizGhs\item\services;
 use bizGhs\base\services\BaseService;
 use bizGhs\item\classes\ItemClass;
 use bizGhs\item\classes\ItemClassClass;
-use bizGhs\item\classes\ItemInfoClass;
+use bizGhs\product\classes\ProductClass;
 use Yii;
 use common\components\util;
 use yii\db\Exception;
@@ -21,11 +21,11 @@ class ItemService extends BaseService
     //新增花材
     public static function addGhsItem($data)
     {
-        $ghsId = $data['ghsId']??0;
+        $merchantId = $data['merchantId']??0;
         $classId = $data['classId']??0;
         $itemId = $data['itemId']??0;
         $shopId = $data['shopId']??0;
-        if(!$ghsId || !$shopId){
+        if(!$merchantId || !$shopId){
             util::fail("请选择供应商/门店");
         }
         if(!$classId){
@@ -37,11 +37,11 @@ class ItemService extends BaseService
         //判断花材是否存在 调用平台花材的方法
         //todo
 
-        $existItemClass = ItemClassClass::exists(['id'=>$classId,'ghsId'=>$ghsId]);
+        $existItemClass = ItemClassClass::exists(['id'=>$classId,'merchantId'=>$merchantId]);
         if(!$existItemClass){
             util::fail("花材分类不存在");
         }
-        $existItem = ItemClass::exists(['itemId'=>$itemId,'ghsId'=>$ghsId]);
+        $existItem = ItemClass::exists(['itemId'=>$itemId,'merchantId'=>$merchantId]);
         if($existItem){
             util::fail("花材已存在");
         }
@@ -50,7 +50,7 @@ class ItemService extends BaseService
         try{
             //写入一条item,同时写入一条itemInfo(初始化库存)
             ItemClass::add($data);
-            ItemInfoClass::add($data);
+            ProductClass::add($data);
             $transaction->commit();
         }catch (Exception $exception){
             $transaction->rollBack();
@@ -66,7 +66,7 @@ class ItemService extends BaseService
         $transaction = $connection->beginTransaction();
         try{
             ItemClass::batchAdd($data);
-            ItemInfoClass::batchAdd($data);
+            ProductClass::batchAdd($data);
             $transaction->commit();
         }catch (\Exception $exception){
             $transaction->rollBack();
@@ -109,7 +109,7 @@ class ItemService extends BaseService
                 'itemId'=>$model['itemId'],
                 'shopId'=>$shopId,
             ];
-            ItemInfoClass::updateByCondition($condition,['delStatus'=>1,'adminId'=>$adminId]);
+            ProductClass::updateByCondition($condition,['delStatus'=>1,'adminId'=>$adminId]);
             $transaction->commit();
         }catch (\Exception $exception){
             $transaction->rollBack();
@@ -118,9 +118,9 @@ class ItemService extends BaseService
     }
 
     //获取所有的花材ID
-    public static function getGhsItemIds($ghsId)
+    public static function getGhsItemIds($merchantId)
     {
-        $data = ItemClass::getGhsItemAll($ghsId,'classId,itemId');
+        $data = ItemClass::getGhsItemAll($merchantId,'classId,itemId');
         return $data;
     }
 }

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -4,7 +4,7 @@ namespace bizGhs\order\classes;
 
 use bizGhs\base\classes\BaseClass;
 use bizGhs\stock\services\StockRecordService;
-use bizGhs\item\classes\ItemInfoClass;
+use bizGhs\product\classes\ProductClass;
 use common\components\util;
 use common\services\xhItemService;
 use Yii;
@@ -22,41 +22,41 @@ class PurchaseOrderClass extends BaseClass
     public static function addOrder($data)
     {
         $date = date("Y-m-d H:i:s");
-        $ghsId = $data['ghsId'];
+        $merchantId = $data['merchantId'];
         $shopId = $data['shopId'];
-        $data['orderStatus'] = self::PURCHASE_ORDER_STATUS_COMPLETE;
+        $data['status'] = self::PURCHASE_ORDER_STATUS_COMPLETE;
         $orderSn = time();
         $data['orderSn'] = $orderSn;
-        $ghsItemInfo = $data['itemInfo']; // [{itemId:0,itemNumBundle:0,itemNumPiece:0,itemPrice:1.0}]
+        $ghsItemInfo = $data['itemInfo']; // [{itemId:0,bigNum:0,smallNum:0,itemPrice:1.0}]
         //计算出总共多少扎，多少支
-        $itemNumBundle = 0; //总共多少扎
-        $itemNumPiece = 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){
-                $itemNumBundle += $v['itemNumBundle'];
-                $itemNumPiece += $v['itemNumPiece'];
+                $bigNum += $v['bigNum'];
+                $smallNum += $v['smallNum'];
                 $totalItemPrice = bcadd($totalItemPrice,$v['itemPrice'],2);
             }
         }
-        $data['itemNumBundle'] = $itemNumBundle;
-        $data['itemNumPiece'] = $itemNumPiece;
-        $data['totalItemPrice'] = $totalItemPrice;
+        $data['bigNum'] = $bigNum;
+        $data['smallNum'] = $smallNum;
+        $data['totalPrice'] = $totalItemPrice;
 
         //计算订单总价
         $packingCharge = $data['packingCharge']??0;
-        $shortHaulCharge = $data['shortHaulCharge']??0;
-        $lineHaulCharge = $data['lineHaulCharge']??0;
+        $shortCharge = $data['shortCharge']??0;
+        $longCharge = $data['longCharge']??0;
         $pickCharge = $data['pickCharge']??0;
-        $localHaulCharge = $data['localHaulCharge']??0;
+        $localCharge = $data['localCharge']??0;
         $orderPrice = bcadd($totalItemPrice,$packingCharge,2);
-        $orderPrice = bcadd($orderPrice,$shortHaulCharge,2);
-        $orderPrice = bcadd($orderPrice,$lineHaulCharge,2);
+        $orderPrice = bcadd($orderPrice,$shortCharge,2);
+        $orderPrice = bcadd($orderPrice,$longCharge,2);
         $orderPrice = bcadd($orderPrice,$pickCharge,2);
-        $orderPrice = bcadd($orderPrice,$localHaulCharge,2);
+        $orderPrice = bcadd($orderPrice,$localCharge,2);
         $data['orderPrice'] = $orderPrice;
 
 
@@ -75,13 +75,13 @@ class PurchaseOrderClass extends BaseClass
                 $tmp['orderSn'] = $orderSn;
                 $tmp['itemId'] = $v['itemId'];
                 $unitNum = $itemData[$itemId]['unitNum']??0;
-                $tmp['itemNum'] = ItemInfoClass::mergeItemNum($v['itemNumBundle'],$v['itemNumPiece'],$unitNum);
+                $tmp['itemNum'] = ProductClass::mergeItemNum($v['bigNum'],$v['smallNum'],$unitNum);
                 $tmp['itemPrice'] = $v['itemPrice'];
                 $itemInfo = [
                     'itemName'=> $itemData[$itemId]['name']??'',
                     'itemCover'=> $itemData[$itemId]['cover']??'',
-                    'itemNumBundle'=> $v['itemNumBundle'],
-                    'itemNumPiece'=> $v['itemNumPiece'],
+                    'bigNum'=> $v['bigNum'],
+                    'smallNum'=> $v['smallNum'],
                     'itemUnit'=> $unitNum?2:1,
                     'itemBigUnit'=> xhItemService::getUnitName($itemData[$v['itemId']]['bigUnit']),
                     'itemSmallUnit'=> xhItemService::getUnitName($itemData[$v['itemId']]['smallUnit']),
@@ -94,7 +94,7 @@ class PurchaseOrderClass extends BaseClass
             //现在暂时点击确定，完成 加库存
             foreach ($batchData as $v){
                 $itemId = $v['itemId'];
-                $ghsItemInfoData = ItemInfoClass::getGhsItemInfoDataByItemId($shopId,$itemId);
+                $ghsItemInfoData = ProductClass::getGhsProductDataByItemId($shopId,$itemId);
                 $ghsItemInfoId = $ghsItemInfoData['id']??0;
                 if(!$ghsItemInfoId){
                     $transaction->rollBack();
@@ -102,7 +102,7 @@ class PurchaseOrderClass extends BaseClass
                 }
                 //流水记录
                 $record = [];
-                $record['ghsId'] = $ghsId;
+                $record['merchantId'] = $merchantId;
                 $record['shopId'] = $shopId;
                 $record['orderSn'] = $orderSn;
                 $record['itemId'] = $itemId;
@@ -111,7 +111,7 @@ class PurchaseOrderClass extends BaseClass
                 $record['newStock'] =  bcadd($ghsItemInfoData['stock'],$v['itemNum'],2);
                 StockRecordService::addPurchaseOrderRecord($record);
                 //加库存
-                ItemInfoClass::addStockByItemNum($ghsItemInfoId,$v['itemNum']);
+                ProductClass::addStockByItemNum($ghsItemInfoId,$v['itemNum']);
             }
             $transaction->commit();
             return $order;
@@ -137,8 +137,8 @@ class PurchaseOrderClass extends BaseClass
     //供应商信息
     public static function groupGhsInfo($list){
         foreach ($list as $k=>$v){
-            $gysId = $v['gysId'];
-            $gysInfo = self::getGysInfo($gysId);
+            $supplierId = $v['supplierId'];
+            $gysInfo = self::getGysInfo($supplierId);
             $list[$k]['gysName'] = $gysInfo['gysName'];
             $list[$k]['gysCover'] = $gysInfo['gysCover'];
         }
@@ -166,14 +166,14 @@ class PurchaseOrderClass extends BaseClass
                 $itemData[] = $tmp;
             }
         }
-        $gysInfo = self::getGysInfo($orderData['gysId']);
+        $gysInfo = self::getGysInfo($orderData['supplierId']);
         $orderData['gysName'] = $gysInfo['gysName'];
         $orderData['gysCover'] = $gysInfo['gysCover'];
         $orderData['itemInfo'] = $itemData;
         return $orderData;
     }
 
-    public static function getGysInfo($gysId)
+    public static function getGysInfo($supplierId)
     {
         return [
             'gysName'=>'供应商1',

biz-ghs/item/classes/ItemInfoClass.php → biz-ghs/product/classes/ProductClass.php

@@ -1,25 +1,18 @@
 <?php
-/**
- * User: admin
- * Date Time: 2021/1/13 17:12
- */
-
-namespace bizGhs\item\classes;
+namespace bizGhs\product\classes;
 
 
 use bizGhs\base\classes\BaseClass;
-use bizGhs\item\models\ItemInfo;
 use common\components\business;
 use common\components\util;
 use common\services\xhItemService;
-
-class ItemInfoClass extends BaseClass
+class ProductClass extends BaseClass
 {
 
-    public static $baseFile = '\bizGhs\item\models\ItemInfo';
+    public static $baseFile = '\bizGhs\product\models\Product';
 
     //根据itemIds获取相应的花材信息
-    public static function getItemInfoByItemIds(array $itemIds)
+    public static function getProductInfoByItemIds(array $itemIds)
     {
         $where = ['itemId'=>['in',$itemIds],'delStatus'=>0];
         $data = self::getAllList('*',$where);
@@ -42,8 +35,8 @@ class ItemInfoClass extends BaseClass
                 $unitNum = $data[$v['itemId']]['unitNum']??0;
                 $stockInfo = self::formatStock($v['stock'],$unitNum);
                 $list[$k]['cover'] = $coverInfo['coverUrl'];
-                $list[$k]['stockBundle'] = $stockInfo['stockBundle'];
-                $list[$k]['stockPiece'] = $stockInfo['stockPiece'];
+                $list[$k]['bigNum'] = $stockInfo['bigNum'];
+                $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']);
@@ -67,11 +60,11 @@ class ItemInfoClass extends BaseClass
         $stockArr = explode('.',$stock);
         $stockPiece = 0; //支
         if(count($stockArr)===2){
-            $stockPiece = bcdiv(bcmul($stockArr[1],$unitNum,1),100,2);
+            $stockPiece = bcdiv(bcmul($stockArr[1],$unitNum,1),100);
         }
         return [
-            'stockBundle'=>$stockBundle,
-            'stockPiece'=>$stockPiece,
+            'bigNum'=>$stockBundle,
+            'smallNum'=>(int)$stockPiece,
         ];
     }
 
@@ -95,9 +88,9 @@ class ItemInfoClass extends BaseClass
 
 
     //获取常用的itemIds
-    public static function getOftenItemIds($ghsId)
+    public static function getOftenItemIds($merchantId)
     {
-        $data = self::getAllList("itemId",['ghsId'=>$ghsId],'actualSold desc');
+        $data = self::getAllList("itemId",['merchantId'=>$merchantId],'actualSold desc');
         if($data){
             $data = array_column($data,'itemId');
         }
@@ -109,91 +102,91 @@ class ItemInfoClass extends BaseClass
     //加库存，允许负库存，负数数量（盘点时）
 
     /**
-     * @param $ghsItemInfoId  门店下的花材ID（xhGhsItemInfo 主键ID）
+     * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
      * @param $itemNumBundle  花材数量（扎）
      * @param $itemNumPiece  花材数量(支)
      * @return bool
      */
-    public static function addStock($ghsItemInfoId,$itemNumBundle,$itemNumPiece)
+    public static function addStock($productId,$itemNumBundle,$itemNumPiece)
     {
-        $itemInfoData =self::getById($ghsItemInfoId);
-        if(!$itemInfoData){
+        $productData =self::getById($productId);
+        if(!$productData){
             util::fail("花材不存在");
         }
-        $itemId = $itemInfoData['itemId'];
+        $itemId = $productData['itemId'];
         $unitNum = xhItemService::getItemUnitNum($itemId);
         //转成小数，加库存
         $itemNum = self::mergeItemNum($itemNumBundle,$itemNumPiece,$unitNum);
-        $newStock = bcadd($itemInfoData['stock'],$itemNum,2);
-        self::updateById($ghsItemInfoId,['stock'=>$newStock]);
+        $newStock = bcadd($productData['stock'],$itemNum,2);
+        self::updateById($productId,['stock'=>$newStock]);
         return true;
     }
 
     //根据数量加库存
-    public static function addStockByItemNum($ghsItemInfoId,$itemNum)
+    public static function addStockByItemNum($productId,$itemNum)
     {
-        $itemInfoData =self::getById($ghsItemInfoId,true);
-        if(!$itemInfoData){
+        $productData =self::getById($productId,true);
+        if(!$productData){
             util::fail("花材不存在");
         }
-        $newStock = bcadd($itemInfoData->stock,$itemNum,2);
-        $itemInfoData->stock = $newStock;
-        $itemInfoData->save();
+        $newStock = bcadd($productData->stock,$itemNum,2);
+        $productData->stock = $newStock;
+        $productData->save();
         return true;
     }
 
     //减库存,允许负库存，负数数量（盘点时）
     /**
-     * @param $ghsItemInfoId  门店下的花材ID（xhGhsItemInfo 主键ID）
+     * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
      * @param $itemNumBundle  花材数量（扎）
      * @param $itemNumPiece  花材数量(支)
      * @return bool
      */
-    public static function decreaseStock($ghsItemInfoId,$itemNumBundle,$itemNumPiece)
+    public static function decreaseStock($productId,$itemNumBundle,$itemNumPiece)
     {
-        $itemInfoData =self::getById($ghsItemInfoId,true);
-        if(!$itemInfoData){
+        $productData =self::getById($productId,true);
+        if(!$productData){
             util::fail("花材不存在");
         }
-        $itemId = $itemInfoData['itemId'];
+        $itemId = $productData['itemId'];
         $unitNum = xhItemService::getItemUnitNum($itemId);
         //转成小数，更新库存
         $itemNum = self::mergeItemNum($itemNumBundle,$itemNumPiece,$unitNum);
-        $newStock = bcsub($itemInfoData['stock'],$itemNum,2);
-        $itemInfoData->stock = $newStock;
-        $itemInfoData->save();
+        $newStock = bcsub($productData->stock,$itemNum,2);
+        $productData->stock = $newStock;
+        $productData->save();
         return true;
     }
 
 
     //根据数量加库存
-    public static function decreaseStockByItemNum($ghsItemInfoId,$itemNum)
+    public static function decreaseStockByItemNum($productId,$itemNum)
     {
-        $itemInfoData =self::getById($ghsItemInfoId);
-        if(!$itemInfoData){
+        $productData =self::getById($productId);
+        if(!$productData){
             util::fail("花材不存在");
         }
-        $newStock = bcsub($itemInfoData['stock'],$itemNum,2);
-        self::updateById($ghsItemInfoId,['stock'=>$newStock]);
+        $newStock = bcsub($productData['stock'],$itemNum,2);
+        self::updateById($productId,['stock'=>$newStock]);
         return true;
     }
 
     //计算价格
     /**
-     * @param $ghsItemInfoId  门店下的花材ID（xhGhsItemInfo 主键ID）
+     * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
      * @param $itemNumBundle  花材数量（扎）
      * @param $itemNumPiece  花材数量(支)
      * @return bool
      */
-    public static function computedPrice($ghsItemInfoId,$itemNumBundle,$itemNumPiece)
+    public static function computedPrice($productId,$itemNumBundle,$itemNumPiece)
     {
         //获取itemId的价格
-        $itemInfoData = self::getById($ghsItemInfoId);
-        if(!$itemInfoData){
+        $productData = self::getById($productId);
+        if(!$productData){
             util::fail("花材不存在");
         }
-        $price = $itemInfoData['price'];
-        $itemId = $itemInfoData['itemId'];
+        $price = $productData['price'];
+        $itemId = $productData['itemId'];
         $unitNum = xhItemService::getItemUnitNum($itemId);
         //换算出一支多少钱
         $piecePrice = 0;
@@ -209,16 +202,16 @@ class ItemInfoClass extends BaseClass
     }
 
     //根据门店ID, 平台花材ID， 获取门店的花材ID
-    public static function getGhsItemInfoId($shopId,$itemId)
+    public static function getGhsProductId($shopId,$itemId)
     {
-        $data = self::getGhsItemInfoDataByItemId($shopId,$itemId);
+        $data = self::getGhsProductDataByItemId($shopId,$itemId);
         if($data){
             return $data['id'];
         }
         return 0;
     }
 
-    public static function getGhsItemInfoDataByItemId($shopId,$itemId)
+    public static function getGhsProductDataByItemId($shopId,$itemId)
     {
         $where = [
             'shopId'=>$shopId,

biz-ghs/product/models/Product.php

@@ -0,0 +1,10 @@
+<?php
+namespace bizGhs\product\models;
+use bizGhs\base\models\Base;
+class Product extends Base
+{
+    public static function tableName()
+    {
+        return 'xhGhsProduct';
+    }
+}

biz-ghs/item/services/ItemInfoService.php → biz-ghs/product/services/ProductService.php

@@ -1,17 +1,14 @@
 <?php
-/**
- * User: admin
- * Date Time: 2021/1/13 17:16
- */
-
-namespace bizGhs\item\services;
+namespace bizGhs\product\services;
 
 
 use bizGhs\base\services\BaseService;
 
-class ItemInfoService extends BaseService
+class ProductService extends BaseService
 {
 
+    public static $baseFile = '\bizGhs\product\classes\ProductClass';
+
     //组装分类花材数据
     public static function assembleData($classIds,$itemIdsInfo,$itemInfoData,$oftenItemIds)
     {

sql.sql

@@ -633,4 +633,41 @@ ALTER TABLE `xhItem` CHANGE `pyName` `py` VARCHAR(20) NOT NULL DEFAULT '' COMMEN
 ALTER TABLE `xhGhsOrderItem` ADD orderSn CHAR(40) NOT NULL DEFAULT '' COMMENT '订单编号' AFTER `orderId`;
 ALTER TABLE xhSupplier MODIFY `py` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '名称拼音首字母';
 ALTER TABLE xhSupplier ADD upShopId INT NOT NULL DEFAULT 0 COMMENT '上游供货商门店id' AFTER `py`;
-ALTER TABLE `xhPurchaseItem` ADD orderSn CHAR(40) NOT NULL DEFAULT '' COMMENT '订单编号' AFTER orderId;
+ALTER TABLE `xhPurchaseItem` ADD orderSn CHAR(40) NOT NULL DEFAULT '' COMMENT '订单编号' AFTER orderId;
+=======
+===
+==linqh 21-01-18
+ALTER TABLE `xhGhsPurchaseOrder`
+CHANGE COLUMN `orderStatus` `status`  tinyint(2) NOT NULL DEFAULT 0 COMMENT '订单状态：1待确认，2待配送，3配送中，4已完成' AFTER `orderSn`,
+CHANGE COLUMN `itemNumBundle` `bigNum`  int(11) NOT NULL DEFAULT 0 COMMENT '合计多少商品(大单位 -扎)' AFTER `gysId`,
+CHANGE COLUMN `itemNumPiece` `smallNum`  int(11) NULL DEFAULT 0 COMMENT '合计多少商品(小单位-支)' AFTER `bigNum`,
+CHANGE COLUMN `totalItemPrice` `totalPrice`  decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT '商品总价格' AFTER `smallNum`,
+CHANGE COLUMN `shortHaulCharge` `shortCharge`  decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT '短途运费' AFTER `packingCharge`,
+CHANGE COLUMN `lineHaulCharge` `longCharge`  decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT '长途运费' AFTER `shortCharge`,
+CHANGE COLUMN `localHaulCharge` `localCharge`  decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT '本地运费' AFTER `pickCharge`;
+
+ALTER TABLE `xhGhsPurchaseOrder`
+CHANGE COLUMN `gysId` `supplierId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '供应商ID' AFTER `adminId`;
+ALTER TABLE `xhGhsPurchaseOrder`
+CHANGE COLUMN `ghsId` `merchantId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '供货商ID' AFTER `id`;
+
+RENAME  TABLE xhGhsItemInfo to xhGhsProduct;
+ALTER TABLE `xhGhsPurchaseOrderItem`
+ADD COLUMN `productId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '门店的产品ID' AFTER `orderSn`;
+
+ALTER TABLE `xhGhsItem`
+CHANGE COLUMN `ghsId` `merchantId`  int(11) NOT NULL DEFAULT 0 COMMENT '商家id' AFTER `id`,
+DROP INDEX `idx_ghsId` ,
+ADD INDEX `idx_merchantId` (`merchantId`) USING BTREE ;
+
+ALTER TABLE `xhGhsItemClass`
+CHANGE COLUMN `ghsId` `merchantId`  int(11) NOT NULL DEFAULT 0 COMMENT '商家id' AFTER `id`,
+DROP INDEX `idx_ghsId` ,
+ADD INDEX `idx_merchantId` (`merchantId`) USING BTREE ;
+
+ALTER TABLE `xhGhsStockRecord`
+CHANGE COLUMN `ghsId` `merchantId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '供货商ID' AFTER `id`;
+
+ALTER TABLE `xhGhsProduct`
+CHANGE COLUMN `ghsId` `merchantId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '供货商ID' AFTER `id`;
+