取消操作

app-ghs/controllers/OrderController.php

@@ -2759,7 +2759,7 @@ class OrderController extends BaseController
             util::fail('超管才能取消订单');
         }
         $get = Yii::$app->request->get();
-        $cashierId = $get['cashierId'] ?? 0;
+        $cashier = $get['cashier'] ?? 0;
         $id = $get['id'] ?? 0;
         $order = OrderClass::getById($id, true);
         OrderClass::valid($order, $this->shopId);
@@ -2767,7 +2767,11 @@ class OrderController extends BaseController
             util::fail('客户下单，不能主动取消');
         }
         //如果收银台的订单，取消时要关闭拉卡拉的订单
-        if($cashierId == 1){
+        if ($cashier == 1) {
+            //已取消，不需要再走下面的流程
+            if ($order->status == 5) {
+                util::complete('已取消');
+            }
             $cgId = $order->purchaseId ?? 0;
             $cg = PurchaseClass::getById($cgId, true);
             $orderSn = $cg->orderSn ?? '';
@@ -2785,8 +2789,12 @@ class OrderController extends BaseController
             ];
             $laResource = new Lakala($params);
             $closeParams = ['orderSn' => $orderSn];
-            //关闭拉卡拉订单
-            $laResource->cashClose($closeParams);
+            //关闭拉卡拉聚合支付订单
+            $response = $laResource->close($closeParams);
+            if (!isset($response['code']) || $response['code'] != 'BBS00000') {
+                $msg = $response['msg'] ?? '未知错误';
+                noticeUtil::push("拉卡拉聚合支付关单失败：{$orderSn}，原因：{$msg}", '15280215347');
+            }
         }
         OrderService::expire($order);
         util::complete('已取消');