Merge branch 'shish-cb' into dev

app-ghs/controllers/ExpressController.php

@@ -172,15 +172,12 @@ class ExpressController extends BaseController
         if ($order->mainId != $this->mainId) {
             util::fail('不是你的订单');
         }
-
-        if ($order->status == 2) {
-            if ($order->fhWlStatus == 1) {
-                util::fail('已发货');
-            }
-        } else {
-            util::fail('无需发货');
+        if ($order->payStatus == 0) {
+            util::fail('订单没有付款');
+        }
+        if (in_array($order->status, [3, 4]) && $order->fhWlStatus == 1) {
+            util::fail('已经发过快递了');
         }
-
         $orderSn = $order->orderSn ?? '';
         $customId = $order->customId ?? 0;
         $custom = CustomClass::getById($customId, true);

biz-ghs/express/classes/ExpressClass.php

@@ -194,7 +194,6 @@ class ExpressClass extends BaseClass
                 'service_name' => $serviceName, // 服务名称
             ],
         ];
-        Yii::info('req:' . json_encode($data));
         $ret = expressUtil::addOrder($merchant, $data, $ptStyle);
         if ($ret['errcode'] == 0) {
             $wayBillId = $ret['waybill_id'] ?? 0;
@@ -211,22 +210,23 @@ class ExpressClass extends BaseClass
             $cg->fhWlStatus = 1;//已经叫物流
             $cg->save();
 
-            $staffId = $params['staffId'];
-            $staffName = $params['staffName'];
-            $params = [
-                'fhType' => 0,
-                'fhWl' => '',
-                'fhWlNo' => '',
-                'staffId' => $staffId,
-                'staffName' => $staffName,
-            ];
-            OrderClass::orderSend($order, $params);
+            if ($order->status == 2) {
+                $staffId = $params['staffId'];
+                $staffName = $params['staffName'];
+                $params = [
+                    'fhType' => 0,
+                    'fhWl' => '',
+                    'fhWlNo' => '',
+                    'staffId' => $staffId,
+                    'staffName' => $staffName,
+                ];
+                OrderClass::orderSend($order, $params);
+            }
 
             $order->fhType = 1;
             $order->save();
             $cg->fhType = 1;
             $cg->save();
-
         } else {
             $code = $ret['errcode'] ?? '';
             $msg = $ret['errmsg'] ?? '';