订单号

app-hd/controllers/PurchaseController.php

@@ -21,6 +21,7 @@ use common\components\freight;
 use common\components\httpUtil;
 use common\components\imgUtil;
 use common\components\noticeUtil;
+use common\components\orderSn;
 use Yii;
 use common\components\util;
 use biz\wx\classes\WxMessageClass;
@@ -673,9 +674,6 @@ class PurchaseController extends BaseController
         if ($order->status != 1) {
             util::fail('订单不是待付款状态');
         }
-        $id = $order->id;
-        $order->changePrice = 2;
-        $order->save();
 
         $deadline = $order->deadline;
         $current = time();
@@ -684,6 +682,25 @@ class PurchaseController extends BaseController
             util::fail('订单已失效，请重新下单');
         }
 
+        //已经唤起过微信支付了，根据拉卡拉的规则，需要生成新的订单号
+        if ($order->changePrice == 2) {
+            $newOrderSn = orderSn::getPurchaseSn();
+            $newGhsOrderSn = orderSn::getGhsOrderSn();
+            $orderSn = $newOrderSn;
+            $order->orderSn = $newOrderSn;
+            $order->save();
+            $saleId = $order->saleId ?? 0;
+            $sale = OrderClass::getById($saleId, true);
+            if (!empty($sale)) {
+                $sale->orderSn = $newGhsOrderSn;
+                $sale->save();
+            }
+        }
+
+        $id = $order->id;
+        $order->changePrice = 2;
+        $order->save();
+
         $name = $orderSn;
         $totalFee = $order->realPrice;
         //强制使用小程序的miniOpenId
@@ -755,6 +772,7 @@ class PurchaseController extends BaseController
             'package' => $package,
             'signType' => $signType,
             'timeStamp' => $timeStamp,
+            'orderSn' => $orderSn,
         ];
         util::success($new);
     }