关单

app-hd/controllers/PurchaseClearController.php

@@ -118,12 +118,8 @@ class PurchaseClearController extends BaseController
 
         //已经唤起过微信支付了，根据拉卡拉的规则，需要生成新的订单号
         if ($order->changePrice == 2) {
-            $newOrderSn = orderSn::getPurchaseClearSn();
-            $orderSn = $newOrderSn;
-            $order->orderSn = $newOrderSn;
-            $order->save();
 
-            //老单号需要关单，否则有付款成功的风险
+            //老单号需要关单，否则有付款成功的风险，老单号关单成功了，才能生成新单号
             $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
             $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
             $params = [
@@ -142,10 +138,13 @@ class PurchaseClearController extends BaseController
             if (isset($response['code']) == false || $response['code'] != 'BBS00000') {
                 $msg = $response['msg'] ?? '';
                 noticeUtil::push('花店结账，单号：' . $oldOrderSn . '，关单没有成功，' . $msg, '15280215347');
-            } else {
-                //noticeUtil::push('花店结账，单号：' . $oldOrderSn . '，关单成功了哦', '15280215347');
+                util::fail('出错了，请取消本单重试');
             }
 
+            $newOrderSn = orderSn::getPurchaseClearSn();
+            $orderSn = $newOrderSn;
+            $order->orderSn = $newOrderSn;
+            $order->save();
         }
         $order->changePrice = 2;
         $order->save();