开单人和收款人必定是同个人

app-ghs/controllers/OrderController.php

@@ -908,13 +908,16 @@ class OrderController extends BaseController
         $shopAdmin = $this->shopAdmin;
         $shopAdminId = $this->shopAdminId;
         $shopAdminName = $shopAdmin->name ?? '';
+        if (isset($post['getStaffId']) == true && !empty($post['getStaffId'])) {
+            $getStaffName = $post['getStaffName'] ?? '';
+            $shopAdminId = $post['getStaffId'];
+            $shopAdminName = $getStaffName;
+        }
+        //开单人和收款人必定是同个人
         $post['shopAdminId'] = $shopAdminId;
         $post['shopAdminName'] = $shopAdminName;
-        //开单人和收款人默认情况是同个人
-        if (isset($post['shopAdminId']) == false || empty($post['shopAdminId'])) {
-            $post['getStaffId'] = $shopAdminId;
-            $post['getStaffName'] = $shopAdminName;
-        }
+        $post['getStaffId'] = $shopAdminId;
+        $post['getStaffName'] = $shopAdminName;
 
         $post['sjId'] = $this->sjId;
         $post['shopId'] = $shopId;