|
|
@@ -474,13 +474,15 @@ class OrderController extends BaseController
|
|
|
|
|
|
//默认情况开单员工和收款员工是同个人
|
|
|
$staffId = $this->shopAdminId ?? 0;
|
|
|
- $post['shopAdminId'] = $staffId;
|
|
|
+ $staffName = $this->shopAdmin->name ?? '';
|
|
|
+ if (isset($post['shopAdminId']) == false || empty($post['shopAdminId'])) {
|
|
|
+ $post['shopAdminId'] = $staffId;
|
|
|
+ $post['shopAdminName'] = $staffName;
|
|
|
+ }
|
|
|
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;
|
|
|
|
|
|
$post['fromType'] = $post['fromType'] ?? 1;
|