撤回到创建和修改订单分开

app-ghs/controllers/OrderController.php

@@ -68,13 +68,8 @@ class OrderController extends BaseController
         util::success($respond);
     }
 
+    //商城下单操作 ssh 2021.1.14
     public function actionCreateOrder()
-    {
-        util::fail('请更新小程序');
-    }
-
-    //商城下单和修改订单操作操作 ssh 2021.1.14
-    public function actionReplaceOrder()
     {
         $post = Yii::$app->request->post();
         $shopId = $this->shopId;
@@ -163,7 +158,8 @@ class OrderController extends BaseController
             $validTime = dict::getDict('kd_order_valid');
             $current = time() + $validTime;
             $post['deadline'] = date("Y-m-d H:i:s", $current);
-            $return = OrderService::replaceOrder($post, $custom);
+
+            $return = OrderService::createOrder($post, $custom);
             $transaction->commit();
             util::success($return);
         } catch (\Exception $e) {

biz-ghs/order/classes/OrderClass.php

@@ -106,23 +106,8 @@ class OrderClass extends BaseClass
     //添加订单 ssh 2019.12.5
     public static function addOrder($data)
     {
-        //2021.8.9 linqh
-        $isUpdateOrder = $data['id'] ?? 0;//是否修改订单，是则为对应的订单id
-        if ($isUpdateOrder) {
-            //退回库存
-            //$oldOrder = self::backStockByUpdateOrder($isUpdateOrder);
-            //2021.8.10 不处理库存退回，要先取消订单
-            $oldOrder = self::getById($isUpdateOrder);
-            if ($oldOrder['status'] != self::ORDER_STATUS_CANCEL) {
-                //订单未取消
-                util::fail("不允许操作未取消的订单");
-            }
-            $orderSn = $oldOrder['orderSn']; //沿用之前的订单号
-        } else {
-            $orderSn = orderSn::getGhsOrderSn();
-        }
         $sjId = $data['sjId'] ?? 0;
-
+        $orderSn = orderSn::getGhsOrderSn();
         $data['orderSn'] = $orderSn;
         $data['payStatus'] = self::PAY_STATUS_UN_PAY;
         $data['customId'] = isset($data['customId']) && !empty($data['customId']) ? $data['customId'] : 0;
@@ -198,34 +183,21 @@ class OrderClass extends BaseClass
 
         $data['weight'] = $weight;
 
-        //此处代码 少华再确认下----2021.8.10 linqh
-        if (!$isUpdateOrder) {
-            //非修改 订单  2021.8.9 linqh
-            //门店总订单数+1
-            $shop = ShopClass::getLockById($currentShopId);
-            if (empty($shop)) {
-                util::fail('没有找到门店');
-            }
-            $shop->totalOrder += 1;
-            $shop->unPayOrder += 1;
-            $shop->save();
-            //将当天日期+花店每天的总订单数作为编号
-            $data['sendNum'] = date("n") . StatOrderCountClass::addOrder($shop);
+        //门店总订单数+1
+        $shop = ShopClass::getLockById($currentShopId);
+        if (empty($shop)) {
+            util::fail('没有找到门店');
         }
+        $shop->totalOrder += 1;
+        $shop->unPayOrder += 1;
+        $shop->save();
 
+        //将当天日期+花店每天的总订单数作为编号
+        $data['sendNum'] = date("n") . StatOrderCountClass::addOrder($shop);
 
         $current = time() + 300;
         $data['deadline'] = isset($data['deadline']) ? $data['deadline'] : date("Y-m-d H:i:s", $current);
-        if ($isUpdateOrder) {
-            //修改  //此处代码 少华再确认下----2021.8.10 linqh
-            $upData = $data;
-            unset($upData['id']);
-            self::updateById($isUpdateOrder, $upData);
-            $return = self::getById($isUpdateOrder, true);
-        } else {
-            $return = self::add($data, true);
-        }
-
+        $return = self::add($data, true);
         return $return;
     }
 
@@ -793,30 +765,4 @@ class OrderClass extends BaseClass
         return $order;
     }
 
-    //修改订单--库存退回  linqh  2021.8.9
-    public static function backStockByUpdateOrder($id)
-    {
-        $order = self::getLockById($id);
-        $shopId = $order->shopId;
-        $shop = ShopClass::getLockById($shopId);
-        if (empty($shop)) {
-            util::fail('没有找到门店');
-        }
-        //加回库存
-        $orderItem = OrderItemClass::getOrderItem($order->orderSn);
-        foreach ($orderItem as $v) {
-            $stockInfo = ProductClass::addStockByItemNum($v['productId'], $v['num']);
-            $recordData = [];
-            $recordData['sjId'] = $order->sjId;
-            $recordData['shopId'] = $shopId;
-            $recordData['itemId'] = $v['itemId'] ?? 0;
-            $recordData['itemNum'] = $v['num'];
-            $recordData['oldStock'] = $stockInfo['oldStock'];
-            $recordData['newStock'] = $stockInfo['newStock'];
-            $recordData['productId'] = $v['productId'];
-            $recordData['orderSn'] = $order->orderSn;
-            StockRecordService::addSellStockOrderCancelRecord($recordData);
-        }
-        return $order;
-    }
 }

biz-ghs/order/services/OrderService.php

@@ -29,8 +29,8 @@ class OrderService extends BaseService
 
     public static $baseFile = '\bizGhs\order\classes\OrderClass';
 
-    //添加修改订单
-    public static function replaceOrder($data, $custom)
+    //添加订单
+    public static function createOrder($data, $custom)
     {
         //供应商销售单
         $return = OrderClass::addOrder($data);
@@ -591,11 +591,9 @@ class OrderService extends BaseService
             }
         }
 
-        //订单付款后（确认后）唤起在线打印
+        //订单生成时唤起在线打印
         if (isset($order->needPrint) && $order->needPrint == dict::getDict('needPrint', 'need')) {
             OrderClass::onlinePrint($order);
-            $order->printNum += 1;
-            $order->save();
         }
 
     }