Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

# Conflicts:
#	sql.sql

app-hd/controllers/GoodsController.php

@@ -199,9 +199,9 @@ class GoodsController extends BaseController
     //保存花材组合 shish 2021.4.10
     public function actionSaveItemGroup()
     {
-        $orderSn = Yii::$app->request->get('orderSn', '');
-        $goodsName = Yii::$app->request->get('name', '');
-        $classId = Yii::$app->request->get('classId', 0);
+        $orderSn = Yii::$app->request->post('orderSn', '');
+        $goodsName = Yii::$app->request->post('name', '');
+        $classId = Yii::$app->request->post('categoryId', 0);
         if (empty($goodsName)) {
             util::fail("名称不能为空");
         }
@@ -215,7 +215,7 @@ class GoodsController extends BaseController
         }
         $order = OrderService::getOrderBySn($orderSn);
         OrderService::valid($order, $this->shopId);
-        $save = GoodsService::saveItemGroup($order, $itemInfo, $goodsName, $classId, $this->adminId);
+        $save = GoodsService::saveItemGroup($order, $itemInfo,  $classId, $goodsName,$this->adminId);
         if ($save) {
             util::complete();
         }

app-hd/controllers/ProductController.php

@@ -91,11 +91,13 @@ class ProductController extends BaseController
         if ($showPage) {
             $respond = ProductClass::getList("*", $where, "inTurn desc");
             $respond['list'] = ProductClass::groupClassName($this->sjId, $respond['list']);
+            $respond['list']  = ProductClass::groupProductInfo($respond['list'] );
             util::success($respond);
         }
         $data = ProductClass::getAllByCondition($where, "inTurn desc", "*");
 
         $data = ProductClass::groupProductInfo($data);
+
         if ($type == 'waring') {
             //库存预警
             $newData = [];

biz-ghs/order/classes/OrderClass.php

@@ -542,7 +542,11 @@ class OrderClass extends BaseClass
         $shop->unPayOrder -= 1;
         $shop->cancelOrder += 1;
         $shop->save();
-
+        //加回库存
+        $orderItem = OrderItemClass::getOrderItem($order->orderSn);
+        foreach ($orderItem as $v){
+            ProductClass::addStockByItemNum($v['productId'],$v['num']);
+        }
         return $order;
     }
 

biz-ghs/order/classes/StockOutOrderClass.php

@@ -153,7 +153,8 @@ class StockOutOrderClass extends BaseClass
         foreach ($itemInfo as $v){
             ProductClass::addStockByItemNum($v['productId'],$v['itemNum']);
         }
-
+        $orderData =  self::getOrderDetail($orderSn,$shopId);
+        StockRecordClass::addRecordByOrder($orderData,StockRecordClass::STOCK_RECORD_TYPE_IN_STOCK_CANCEL);
         self::updateByCondition($where,$data);
 
     }

biz-ghs/stock/classes/StockRecordClass.php

@@ -18,6 +18,7 @@ class StockRecordClass extends BaseClass
     const STOCK_RECORD_TYPE_CHECK_STOCK = 4; //盘点
     const STOCK_RECORD_TYPE_SELL_STOCK = 5; //销售（卖出）
     const STOCK_RECORD_TYPE_OUT_STOCK_CANCEL = 6; //取消入库
+    const STOCK_RECORD_TYPE_IN_STOCK_CANCEL = 7; //取消出库
 
     public static $typeMap = [
         self::STOCK_RECORD_TYPE_PURCHASE=>'采购入库',
@@ -75,18 +76,24 @@ class StockRecordClass extends BaseClass
             $record['orderSn'] = $orderData['orderSn'];
             $record['itemId'] = $itemId;
             $record['itemNum'] = $itemNum;
-            $record['oldStock'] = $productData[$productId]['stock'];
+            $record['oldStock'] = $v['itemStock']; //当时库存
             $record['recordType'] =$type;
-            switch ($type){
-                case self::STOCK_RECORD_TYPE_IN_STOCK:
-                    //入库
-                    $record['newStock'] =  bcsub($productData[$productId]['stock'],$itemNum,2);
-                    break;
-                case self::STOCK_RECORD_TYPE_OUT_STOCK_CANCEL:
-                    //取消入库
-                    $record['newStock'] =  bcadd($productData[$productId]['stock'],$itemNum,2);
-                    break;
-            }
+            $record['productId'] = $productId;
+            $record['newStock'] = $productData[$productId]['stock'];// 最新库存
+//            switch ($type){
+//                case self::STOCK_RECORD_TYPE_OUT_STOCK:
+//                    //出库
+//                case self::STOCK_RECORD_TYPE_OUT_STOCK_CANCEL:
+//                    //取消入库
+//                    $record['newStock'] = $productData[$productId]['stock'];
+//                    break;
+//                case self::STOCK_RECORD_TYPE_IN_STOCK:
+//                    //入库
+//                case self::STOCK_RECORD_TYPE_IN_STOCK_CANCEL:
+//                    //取消出库
+//                    $record['newStock'] = $productData[$productId]['stock'];
+//                    break;
+//            }
             //记录流水
             StockRecordService::add($record);
 

biz-hd/goods/services/GoodsService.php

@@ -86,6 +86,7 @@ class GoodsService extends BaseService
     {
         $connection = Yii::$app->db;//事务处理
         $transaction = $connection->beginTransaction();
+        $now = date('Y-m-d H:i:s');
         try{
             //新增goods  todo  还有很多字段待确定
             $goodsData = [
@@ -95,6 +96,9 @@ class GoodsService extends BaseService
                 'adminId'=>$adminId,//
                 'merchantId'=>$order['merchantId'],//
                 'status'=>0,//
+                'content'=>'',//
+                'createTime'=>$now,
+                'updateTime'=>$now,
             ];
             $goodsInfo = GoodsClass::add($goodsData);
             $gId = $goodsInfo['id'];
@@ -110,8 +114,8 @@ class GoodsService extends BaseService
             foreach ($items as $v){
                 $itemData = [
                     'goodsId'=>$gId,
-                    'productId'=>$items['productId'],
-                    'itemId'=>$items['itemId'],
+                    'productId'=>$v['productId'],
+                    'itemId'=>$v['itemId'],
                 ];
                 GoodsItemClass::add($itemData);
             }

sql.sql

@@ -2526,6 +2526,8 @@ TRUNCATE `xhSetMeal`;
 INSERT INTO xhSetMeal(id,`style`,`name`,price,num) VALUES(NULL,1,'基础版',1980,0),(NULL,2,'基础版',2980,0);
 ALTER TABLE `xhSetMeal` RENAME TO `xhSet`;
 ALTER TABLE xhRenew MODIFY `status` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1 待付款 2已付款';
+
+
 drop table if exists `xhShopYeChange`;
 CREATE TABLE if not exists `xhShopYeChange` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -2551,6 +2553,7 @@ ALTER TABLE xhCash MODIFY `event` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '说
 ALTER TABLE xhCash ADD sjName VARCHAR(100) NOT NULL DEFAULT '' COMMENT '商家名称' AFTER `shopId`;
 ALTER TABLE xhCash ADD shopName VARCHAR(100) NOT NULL DEFAULT '' COMMENT '门店名称' AFTER `sjName`;
 ALTER TABLE xhCash ADD shopAdminId INT NOT NULL DEFAULT 0 COMMENT '申请提现的员工' AFTER `shopId`;
+ALTER TABLE xhCash ADD shopAdminId INT NOT NULL DEFAULT 0 COMMENT '申请提现的员工' AFTER `shopId`;
 ALTER TABLE xhCash ADD cashName VARCHAR(100) NOT NULL DEFAULT '' COMMENT '姓名' AFTER `shopName`;
 ALTER TABLE xhCash ADD cashAccount VARCHAR(100) NOT NULL DEFAULT '' COMMENT '帐号' AFTER `cashName`;
 ALTER TABLE xhCash ADD thirdOrderSn VARCHAR(200) NOT NULL DEFAULT '' COMMENT '第三方流水号' AFTER `cashAccount`;
@@ -2558,4 +2561,8 @@ CREATE TABLE `xhCashSn` (
   `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB AUTO_INCREMENT=12123500 COMMENT='提现申请订单号';
-ALTER TABLE xhCash ADD orderSn CHAR(30) NOT NULL DEFAULT '' COMMENT '订单编号' AFTER `id`;
+ALTER TABLE xhCash ADD orderSn CHAR(30) NOT NULL DEFAULT '' COMMENT '订单编号' AFTER `id`;
+
+--------linqh 2021.5.17
+ALTER TABLE `xhGhsStockRecord`
+ADD COLUMN `productId`  int(11) NOT NULL DEFAULT 0 AFTER `orderSn`;