确认送达

app-ghs/controllers/OrderController.php

@@ -136,7 +136,11 @@ class OrderController extends BaseController
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
-            OrderClass::confirmReach($order);
+            $staff = $this->shopAdmin;
+            $staffId = $staff->id??0;
+            $staffName= $staff->name??'';
+            $params = ['staffId'=>$staffId,'staffName'=>$staffName];
+            OrderClass::confirmReach($order,$params);
             $transaction->commit();
             util::complete('操作成功');
         } catch (\Exception $e) {

biz-ghs/order/classes/OrderClass.php

@@ -355,7 +355,7 @@ class OrderClass extends BaseClass
         util::success(['file' => $fileUrl, 'shortFile' => $file]);
     }
 
-    public static function confirmReach($order)
+    public static function confirmReach($order,$params=[])
     {
         $cgId = $order->purchaseId ?? 0;
         $cg = PurchaseClass::getById($cgId, true);
@@ -385,7 +385,10 @@ class OrderClass extends BaseClass
         }
         //订单如果没有发货则先发货
         if ($order->status == 2) {
-            self::orderSend($order, [], true);
+            $staffId = $params['staffId']??0;
+            $staffName = $params['staffName']??'';
+            $element = ['staffId'=>$staffId,'staffName'=>$staffName];
+            self::orderSend($order, $element, true);
             $cg = PurchaseClass::getById($cgId, true);
         }
         PurchaseClass::takeToPutIn($cg);