开单

app-ghs/controllers/OrderController.php

@@ -977,7 +977,7 @@ class OrderController extends BaseController
         Yii::$app->redis->executeCommand('SETEX', [$createOrderCacheKey, 5, 'has']);
 
         CustomClass::valid($custom, $this->shopId);
-        if (isset($custom['mainId']) && !empty($custom['mainId']) && $custom['mainId'] == $custom['ownMainId']) {
+        if (!empty($custom['mainId']) && $custom['mainId'] == $custom['ownMainId']) {
             util::fail('不能给自己开单');
         }
         $post['ghsId'] = $custom['ghsId'] ?? 0;
@@ -999,12 +999,17 @@ class OrderController extends BaseController
             if (getenv('YII_ENV') == 'production') {
                 $tbMainId = 44171;
                 //平潭花天下，就算选了收款人，也不要给改变开单人，临时解决方案 ssh 2250314
-            }else{
+            } else {
                 $tbMainId = 644;
             }
-            if($this->mainId == $tbMainId){
+            if ($this->mainId == $tbMainId) {
                 //平潭花天下，就算选了收款人，也不要给改变开单人，临时解决方案 ssh 2250314
-            }else{
+                if (!empty($post['shopAdminId'])) {
+                    $getStaffName = $post['shopAdminName'] ?? '';
+                    $shopAdminId = $post['shopAdminId'];
+                    $shopAdminName = $getStaffName;
+                }
+            } else {
                 $getStaffName = $post['getStaffName'] ?? '';
                 $shopAdminId = $post['getStaffId'];
                 $shopAdminName = $getStaffName;