收银台关单

app-hd/controllers/PurchaseClearController.php

@@ -164,15 +164,22 @@ class PurchaseClearController extends BaseController
                 'orderSn' => $oldOrderSn,
             ];
             $response = $laResource->close($closeParams);
-            if (isset($response['code']) == false || $response['code'] != 'BBS00000') {
+            if (!isset($response['code']) || $response['code'] != 'BBS00000') {
                 $msg = $response['msg'] ?? '';
                 $code = $response['code'] ?? 0;
-                if (!in_array($code, ['BBS11114'])) {
-                    $customMobile = $order->customMobile ?? '';
-                    $ghsName = $order->ghsName ?? '';
-                    noticeUtil::push('重点注意，花店结账，单号：' . $oldOrderSn . '，关单没有成功，原因：【' . $msg . '】，可能造成无法结账，客户手机号：' . $customMobile . '，供货商：' . $ghsName . '，客户端给提示的内容：出错了，请取消本单重试', '15280215347');
-                    util::fail('出错了，请取消本单重试');
-                }
+                $customMobile = $order->customMobile ?? '';
+                $ghsName = $order->ghsName ?? '';
+                noticeUtil::push('花店结账，单号：' . $oldOrderSn . '，关单没有成功，原因：【' . $msg . '】，' . $code . '，客户手机号：' . $customMobile . '，供货商：' . $ghsName, '15280215347');
+                //util::fail('出错了，请取消本单重试');
+            }
+
+            //收银台关单
+            $closeParams = ['orderSn' => $orderSn];
+            $response = $laResource->cashClose($closeParams);
+            if (!isset($response['code']) || $response['code'] != '000000') {
+                $msg = $response['msg'] ?? '';
+                $code = $response['code'] ?? 0;
+                noticeUtil::push('花店结账，单号：' . $oldOrderSn . '，收银台关单没有成功，原因：【' . $msg . '】，' . $code, '15280215347');
             }
 
             $newOrderSn = orderSn::getPurchaseClearSn();