订单编号

biz-hd/order/classes/OrderSendClass.php

@@ -32,15 +32,16 @@ class OrderSendClass extends BaseClass
         $payTime = $data['payTime'];
         $actionId = self::$actionId;
         $placeOrderId = $actionId['placeOrder'];
+        $orderSn = $data['orderSn'] ?? '';
         $time = time();
-        $data = ['actionId' => $placeOrderId, 'orderId' => $orderId, 'finishTime' => $payTime, 'addTime' => $time, 'inTurn' => $placeOrderId];
+        $data = ['actionId' => $placeOrderId, 'orderId' => $orderId, 'orderSn' => $orderSn, 'finishTime' => $payTime, 'addTime' => $time, 'inTurn' => $placeOrderId];
         self::add($data);
 
         OrderClass::updateById($orderId, ['currentFlow' => 1]);
 
         //制单未开始
         $printOrderId = $actionId['printOrder'];
-        $data = ['actionId' => $printOrderId, 'orderId' => $orderId, 'finishTime' => 0, 'addTime' => $time, 'inTurn' => $printOrderId];
+        $data = ['actionId' => $printOrderId, 'orderId' => $orderId, 'orderSn' => $orderSn, 'finishTime' => 0, 'addTime' => $time, 'inTurn' => $printOrderId];
         self::add($data);
     }
 

common/services/xhPayToolService.php

@@ -4,7 +4,6 @@ namespace common\services;
 
 use biz\shop\classes\ShopAdminClass;
 use biz\shop\models\Shop;
-use bizGhs\order\classes\OrderSendClass;
 use bizHd\coupon\classes\CouponClass;
 use bizHd\merchant\classes\ShopClass;
 use bizHd\order\classes\OrderClass;
@@ -18,8 +17,6 @@ use common\components\stringUtil;
 use common\components\util;
 use Yii;
 use common\components\dict;
-use linslin\yii2\curl;
-use common\components\wxUtil;
 
 /**
  * 支付工具