默认情况开单员工和收款员工是同个人

app-ghs/controllers/OrderController.php

@@ -722,9 +722,17 @@ class OrderController extends BaseController
         $post['showAddress'] = $custom['showAddress'] ?? '';
         $post['long'] = $custom['long'] ?? '';
         $post['lat'] = $custom['lat'] ?? '';
-        $shopAdmin = $this->shopAdmin->attributes;
-        $post['shopAdminId'] = isset($post['shopAdminId']) && !empty($post['shopAdminId']) ? $post['shopAdminId'] : $this->shopAdminId;
-        $post['shopAdminName'] = isset($post['shopAdminName']) && !empty($post['shopAdminName']) ? $post['shopAdminName'] : $shopAdmin['name'];
+        $shopAdmin = $this->shopAdmin;
+        $shopAdminId = $this->shopAdminId;
+        $shopAdminName = $shopAdmin->name ?? '';
+        $post['shopAdminId'] = $shopAdminId;
+        $post['shopAdminName'] = $shopAdminName;
+        //开单人和收款人默认情况是同个人
+        if (isset($post['shopAdminId']) == false || empty($post['shopAdminId'])) {
+            $post['getStaffId'] = $shopAdminId;
+            $post['getStaffName'] = $shopAdminName;
+        }
+
         $post['sjId'] = $this->sjId;
         $post['shopId'] = $shopId;
         $post['mainId'] = $this->mainId;
@@ -739,7 +747,6 @@ class OrderController extends BaseController
             $post['debt'] = OrderClass::DEBT_YES;
         }
 
-        $shopAdmin = $this->shopAdmin;
         if (isset($shopAdmin->super) == false || $shopAdmin->super != 1) {
             if ($hasPay == dict::getDict('hasPay', 'payed')) {
                 util::fail('没有权限');

app-hd/controllers/OrderController.php

@@ -355,7 +355,15 @@ class OrderController extends BaseController
         $post['deadline'] = $expireTime;
         $post['staffId'] = $this->shopAdminId ?? 0;
         $post['staffName'] = $this->shopAdmin->name ?? '';
-        $post['shopAdminId'] = $this->shopAdminId ?? 0;
+
+        //默认情况开单员工和收款员工是同个人
+        $staffId = $this->shopAdminId ?? 0;
+        $post['shopAdminId'] = $staffId;
+        if (isset($post['getStaffId']) == false || empty($post['getStaffId'])) {
+            $post['getStaffId'] = $staffId;
+            $post['getStaffName'] = $this->shopAdmin->name ?? '';
+        }
+
         $post['shopAdminName'] = $this->shopAdmin->name ?? '';
         $groupId = isset($post['groupId']) && !empty($post['groupId']) ? $post['groupId'] : 0;
         //1 门店（收银台开单）