Merge branch 'master' into dev

app-ghs/controllers/OrderController.php

@@ -1088,6 +1088,18 @@ class OrderController extends BaseController
                 if (in_array($this->mainId, [19606])) {
                     util::fail('请选择开单人');
                 }
+                if (getenv('YII_ENV') == 'production') {
+                    //南粤选了开单，也只能变成本人开单
+                    if($this->mainId == 22388){
+                        $post['shopAdminName'] = $shopAdminName;
+                        $post['shopAdminId'] = $shopAdminId;
+                    }
+                }else{
+                    if($this->mainId == 644){
+                        $post['shopAdminName'] = $shopAdminName;
+                        $post['shopAdminId'] = $shopAdminId;
+                    }
+                }
             } else {
                 if (in_array($this->mainId, [])) {
                     util::fail('请选择开单人');