修改订单

app-ghs/controllers/OrderController.php

@@ -239,7 +239,21 @@ class OrderController extends BaseController
             $current = time() + $validTime;
             $post['deadline'] = date("Y-m-d H:i:s", $current);
 
-            $return = OrderService::updateOrder($order, $post);
+            $upData = [
+                'payWay' => $post['payWay'],
+                'sendType' => $post['sendType'],
+                'debt' => $post['debt'],
+                'needPrint' => $post['needPrint'],
+                'modifyPrice' => $post['modifyPrice'],
+                'shopAdminId' => $post['shopAdminId'],
+                'shopAdminName' => $post['shopAdminName'],
+                'fromType' => 1,
+                'sendCost' => $post['sendCost'],
+                'product' => $post['product'],
+                'deadline' => $post['deadline'],
+            ];
+
+            $return = OrderService::updateOrder($order, $upData);
             $transaction->commit();
             util::success($return);
         } catch (\Exception $e) {

biz-ghs/order/classes/OrderClass.php

@@ -206,6 +206,7 @@ class OrderClass extends BaseClass
     {
         $sjId = $order->sjId ?? 0;
         $orderSn = $order->orderSn ?? 0;
+        $currentShopId = $order->shopId ?? 0;
 
         $data['payStatus'] = self::PAY_STATUS_UN_PAY;
 
@@ -250,7 +251,7 @@ class OrderClass extends BaseClass
         $current = time() + $validTime;
         $data['deadline'] = $data['deadline'] ?? date("Y-m-d H:i:s", $current);
         $data['status'] = self::ORDER_STATUS_UN_PAY;
-        $currentShopId = $data['shopId'] ?? 0;
+
         //计算总重量(kg)
         $weight = 0;
         $productMapData = ProductClass::getProductMapData($product);
@@ -277,7 +278,7 @@ class OrderClass extends BaseClass
         $current = time() + 300;
         $data['deadline'] = isset($data['deadline']) ? $data['deadline'] : date("Y-m-d H:i:s", $current);
         //修改订单暂时不打印
-        $data['needPrint'] = dict::getDict('needPrint', 'noNeed');
+        $data['needPrint'] = $data['needPrint'] ?? dict::getDict('needPrint', 'need');
 
         $orderId = $order->id ?? 0;
         self::updateById($orderId, $data);

biz-ghs/order/services/OrderService.php

@@ -176,6 +176,13 @@ class OrderService extends BaseService
         if (isset($data['sendType']) && $data['sendType'] == OrderClass::SEND_TYPE_NO) {
             PurchaseService::payAfter($purchase, $payWay);
             self::payAfter($returnOrder, $payWay);
+        } else {
+            //没有进入确认流程的订单也有打印需求
+            if ($data['needPrint'] == dict::getDict('needPrint', 'need')) {
+                OrderClass::onlinePrint($returnOrder);
+                $returnOrder->printNum += 1;
+                $returnOrder->save();
+            }
         }
         return $returnOrder;