Merge branch 'feature/3146-joway-4' into develop

common/models/ApproachOrder.php

@@ -70,7 +70,7 @@ class ApproachOrder extends \common\components\ActiveRecord
     public function rules()
     {
         return [
-            [['USER_ID', 'USER_NAME', 'ORDER_TYPE', 'CREATE_USER'], 'required'],
+            [['USER_ID',  'ORDER_TYPE', 'CREATE_USER'], 'required'],
             [['ORDER_AMOUNT', 'PV', 'PAY_AMOUNT', 'PAY_PV', 'FREIGHT', 'PAY_FREIGHT'], 'number'],
             [['PAY_AT', 'DELIVERY_STATUS', 'DELIVERY_PERIOD', 'DELIVERY_AT', 'EXPRESS_TYPE', 'PERIOD_NUM', 'STATUS', 'PROVINCE', 'CITY', 'COUNTY', 'CREATED_AT', 'UPDATED_AT', 'IS_DELETE', 'DELETED_AT'], 'integer'],
             [['ID','SN', 'DEC_SN', 'USER_ID', 'ORDER_TRACK_NO','PAY_TYPE'], 'string', 'max' => 32],

common/models/Order.php

@@ -70,7 +70,7 @@ class Order extends \common\components\ActiveRecord
     public function rules()
     {
         return [
-            [['USER_ID', 'USER_NAME', 'ORDER_TYPE', 'CREATE_USER'/*, 'EMAIL'*/], 'required'],
+            [['USER_ID', 'ORDER_TYPE', 'CREATE_USER'/*, 'EMAIL'*/], 'required'],
             [['ORDER_AMOUNT', 'PV', 'PAY_AMOUNT', 'PAY_PV', 'FREIGHT', 'PAY_FREIGHT', 'ORDER_AMOUNT_STANDARD', 'PAY_AMOUNT_STANDARD', 'EXCHANGE_RATE'], 'number'],
             [['PAY_AT', 'DELIVERY_STATUS', 'DELIVERY_PERIOD', 'DELIVERY_AT', 'EXPRESS_TYPE', 'PERIOD_NUM', 'STATUS', 'PROVINCE', /*'CITY', 'COUNTY', */'CREATED_AT', 'UPDATED_AT', 'IS_DELETE', 'DELETED_AT'], 'integer'],
             [['ID','SN', 'DEC_SN', 'USER_ID', 'ORDER_TRACK_NO','PAY_TYPE'], 'string', 'max' => 32],

common/models/forms/ApproachOrderForm.php

@@ -1,6 +1,7 @@
 <?php
 namespace common\models\forms;
 
+use Codeception\Module\Db;
 use common\helpers\Cache;
 use common\helpers\Date;
 use common\components\Model;
@@ -490,7 +491,6 @@ class ApproachOrderForm extends Model
         $this->_payAmount = $this->_decAmount + $this->_freight;
         $this->_decAmountStandard = $totalAmountStandard;
         $this->_standardAmount = $this->_decAmountStandard + $this->_freight;
-        $this->_userName = $this->userName;
 
         $db = \Yii::$app->db;
         $transaction = $db->beginTransaction();
@@ -532,7 +532,7 @@ class ApproachOrderForm extends Model
 
         $userId = \Yii::$app->user->id;
 
-        $userName = $this->decUserName;
+        $userName = Info::getUserNameByUserId($userId);
         $userRealName = Info::getUserRealNameByUserId($userId);
         $userMobile = Info::getUserMobileByUserId($userId);
         $userEmail = Info::getUserEmailByUserId($userId);
@@ -554,7 +554,7 @@ class ApproachOrderForm extends Model
         $orderModel->DEC_SN = 'DS' . $ordNo;
         $orderModel->ORDER_TYPE = $this->type;
         $orderModel->USER_ID = $userId;
-        $orderModel->USER_NAME = $userName;
+        $orderModel->USER_NAME = $this->decUserName ?? '';
         $orderModel->ORDER_AMOUNT = $this->_decAmount;
         $orderModel->PV = $_hasPV;
         $orderModel->PAY_AMOUNT = $this->_payAmount;

common/models/forms/OrderForm.php

@@ -688,7 +688,7 @@ class OrderForm extends Model
 
         $userId = \Yii::$app->user->id;
 
-        $userName = $this->decUserName;
+        $userName = Info::getUserNameByUserId($userId);
         $userRealName = Info::getUserRealNameByUserId($userId);
         $userMobile = Info::getUserMobileByUserId($userId);
         $userEmail = Info::getUserEmailByUserId($userId);
@@ -711,7 +711,7 @@ class OrderForm extends Model
         $orderModel->DEC_SN = 'DS'.$ordNo;
         $orderModel->ORDER_TYPE = $this->type;
         $orderModel->USER_ID = $userId;
-        $orderModel->USER_NAME = $userName;
+        $orderModel->USER_NAME = $this->decUserName;;
         $orderModel->ORDER_AMOUNT = $this->_decAmount;
         $orderModel->PV = $_hasPV;
         $orderModel->PAY_AMOUNT = $this->_payAmount;

frontendApi/modules/v1/controllers/ShopController.php

@@ -135,7 +135,7 @@ class ShopController extends BaseController {
         $freight = floatval(Cache::getSystemConfig()['freight']['VALUE'] ?? 0);
         // 普通商品免运费阈值.奈拉
         $freeShipping = floatval(Cache::getSystemConfig()['freeShipping']['VALUE'] ?? 0);
-
+        $isDec = User::getEnCodeInfo(\Yii::$app->user->id)['IS_DEC'];
         return static::notice(
             [
                 'payList'=>$payList,
@@ -144,6 +144,7 @@ class ShopController extends BaseController {
                 'sellType' => ShopGoods::getCategoryType(),
                 'freight' => $freight,
                 'freeShipping' => $freeShipping,
+                'isDec' => $isDec,
             ]);
     }
 
@@ -157,6 +158,18 @@ class ShopController extends BaseController {
             $formModel->remark = 'FX';//复销备注
             $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']){
+                return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
+            }
+            if($post['userName']){
+                //查询报单编号是否存在
+                $userId = Info::getUserIdByUserName($post['userName']);
+                if(!$userId){
+                    return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
+                }
+            }
+
             $formModel->decUserName = $post['userName'];
             if ($formModel->load($post, '') && $order = $formModel->add()) {
                 return static::notice($order);
@@ -189,6 +202,17 @@ class ShopController extends BaseController {
             $formModel->remark = '复销备注';
             $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']){
+                return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
+            }
+            //查询报单编号是否存在
+            if($post['userName']){
+                $userId = Info::getUserIdByUserName($post['userName']);
+                if(!$userId){
+                    return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
+                }
+            }
             $formModel->decUserName = $post['userName'];
             if ($formModel->load($post, '') && $order = $formModel->add()) {
                 return static::notice($order);

frontendApi/modules/v1/controllers/UserController.php

@@ -386,10 +386,17 @@ class UserController extends BaseController {
         $redis = \Yii::$app->redis;
         $post = \Yii::$app->request->post();
         if (\Yii::$app->request->isPost) {
-            $isDec = User::getEnCodeInfo(\Yii::$app->user->id)['IS_DEC'];
-            if($isDec == 1 && empty($post['decUserName'])){
+            $userInfo = User::getEnCodeInfo(\Yii::$app->user->id);
+            if($userInfo['IS_DEC'] == 1 && !empty($post['decUserName']) && $post['decUserName'] != $userInfo['USER_NAME']){
                 return static::notice(Yii::t('app', 'decUserNameDoesNotExist'), 400);
             }
+            if($post['decUserName']){
+                //查询报单编号是否存在
+                $userId = Info::getUserIdByUserName($post['decUserName']);
+                if(!$userId){
+                    return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
+                }
+            }
             // 根据支付方式区分逻辑
             $payMethod = \Yii::$app->request->post('payType', '');
 
@@ -482,6 +489,7 @@ class UserController extends BaseController {
             'sellType' => ShopGoods::getCategoryType(),
             'categoryType' => ShopGoods::getCategoryType()[0]['id'],
             'userBalance' => $userBalance,
+            'isDec' => $isDec,
         ]);
     }