库存优化

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);
 

sql.sql

@@ -2525,4 +2525,8 @@ ALTER TABLE `xhSetMeal` ADD `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIME
 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已付款';
+ALTER TABLE xhRenew MODIFY `status` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1 待付款 2已付款';
+
+--------linqh 2021.5.17
+ALTER TABLE `xhGhsStockRecord`
+ADD COLUMN `productId`  int(11) NOT NULL DEFAULT 0 AFTER `orderSn`;