bugfix

common/models/forms/OrderForm.php

@@ -86,7 +86,7 @@ class OrderForm extends Model
     {
         return [
             [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','userName','consignee','acceptMobile','province'/*,'city','county'*/,'cityName','lgaName','detailaddress','email'], 'trim'],
-            [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','userName','consignee','acceptMobile','province','city','county','detailaddress'/*,'email'*/], 'required'],
+            [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','consignee','acceptMobile','province','city','county','detailaddress'/*,'email'*/], 'required'],
             [['status'], 'isStatus'],
             [['addressId'], 'isAddress'],
             [['payType'], 'isPayType'],

frontendApi/modules/v1/controllers/ShopController.php

@@ -159,12 +159,13 @@ class ShopController extends BaseController {
             $post = \Yii::$app->request->post();
             $post['type'] = DeclarationForm::TYPE_FX;
             $userInfo = User::getEnCodeInfo(\Yii::$app->user->id);
-            if($userInfo['IS_DEC'] == 1 && !empty($post['userName']) && $post['userName'] != $userInfo['USER_NAME']){
+            $userName = $post['userName'] ?? '';
+            if($userInfo['IS_DEC'] == 1 && $userName != $userInfo['USER_NAME']){
                 return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
             }
-            if($post['userName'] && $userInfo['IS_DEC'] == 0){
+            if($userName && $userInfo['IS_DEC'] == 0){
                 //查询报单编号是否存在
-                $userId = Info::getUserIdByUserName($post['userName']);
+                $userId = Info::getUserIdByUserName($userName);
                 if(!$userId){
                     return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
                 }
@@ -174,7 +175,7 @@ class ShopController extends BaseController {
                 }
             }
 
-            $formModel->decUserName = $post['userName'];
+            $formModel->decUserName = $userName;
             if ($formModel->load($post, '') && $order = $formModel->add()) {
                 return static::notice($order);
             } else {