发快递

app-ghs/controllers/OrderController.php

@@ -285,6 +285,18 @@ class OrderController extends BaseController
     //发快递和第三方配送 shish 2021.1.24
     public function actionThirdSend()
     {
+
+        $data = [
+            "expressName" => "沙盒测试",
+            "expressId" => "1",
+            "distance" => 5,
+            "sendCost" => 12,
+            "status" => 1,
+            "tip" => 0,
+        ];
+        util::success($data);
+
+        
         $get = Yii::$app->request->get();
         $id = isset($get['id']) ? $get['id'] : 0;
         $info = OrderClass::getOrderInfo($id);

biz-ghs/order/classes/OrderClass.php

@@ -60,7 +60,7 @@ class OrderClass extends BaseClass
     //添加订单 shish 2019.12.5
     public static function addOrder($data)
     {
-        $merchantId = $data['merchantId'] ?? 0;
+        $sjId = $data['merchantId'] ?? 0;
         $month = date("Ym");
         $orderSn = orderSn::getGhsOrderSn();
         $data['orderSn'] = $orderSn;
@@ -71,7 +71,7 @@ class OrderClass extends BaseClass
         OrderItemClass::replace(['orderSn' => $orderSn], $product, true);
 
         //将花店每月的总订单数作为编号
-        $riseNum = StatOrderCountClass::addOrder($month, $merchantId);
+        $riseNum = StatOrderCountClass::addOrder($month, $sjId);
         $data['sendNum'] = $riseNum;
         $data['num'] = 1;
         $data['smallNum'] = 1;
@@ -83,7 +83,7 @@ class OrderClass extends BaseClass
         $return = self::add($data);
 
         //全部订单+1，待付款订单+1
-        $merchantAsset = MerchantAssetClass::getByMerchantId($merchantId, true);
+        $merchantAsset = MerchantAssetClass::getByMerchantId($sjId, true);
         $merchantAsset->unPayOrder += 1;
         $merchantAsset->totalOrder += 1;
         $merchantAsset->save();
@@ -389,8 +389,8 @@ class OrderClass extends BaseClass
         OrderSendClass::withoutSend($order);
 
         //待发货订单-1，完成订单+1
-        $merchantId = $order['merchantId'];
-        $asset = MerchantAssetClass::getByMerchantId($merchantId, true);
+        $sjId = $order['merchantId'];
+        $asset = MerchantAssetClass::getByMerchantId($sjId, true);
         $asset->finishOrder += 1;
         $asset->unSendOrder -= 1;
         $asset->save();