d

common/models/forms/OrderForm.php

@@ -56,7 +56,6 @@ class OrderForm extends Model
 
     public $userName;
     public $decUserName;
-    public $noLoginUserId;
     public $consignee;
     public $acceptMobile;
     public $province;
@@ -97,8 +96,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','decUserName'], 'trim'],
-            [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum','consignee','acceptMobile','province','city','county','detailaddress'/*,'email'*/,'decUserName'], 'required'],
-            [['payPassword'], 'required', 'when' => function ($model) { return $model->scenario !== 'noLoginReconsumeOrder'; }],
+            [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','consignee','acceptMobile','province','city','county','detailaddress'/*,'email'*/,'decUserName'], 'required'],
             [['status'], 'isStatus'],
             [['addressId'], 'isAddress'],
             [['payType'], 'isPayType'],
@@ -154,7 +152,6 @@ class OrderForm extends Model
             'userOrder' => ['type','addressId', 'payType','goodsId','goodsNum', 'remark', 'payPassword', 'period'],
             // 帮会员复消下单
             'reconsumeOrder' => ['type','userName', 'payType','goodsId','goodsNum', 'remark', 'payPassword','consignee','acceptMobile','province','cityName','lgaName','detailaddress','decUserName'],
-            'noLoginReconsumeOrder' => ['type','userName', 'payType','goodsId','goodsNum', 'remark','consignee','acceptMobile','province','cityName','lgaName','detailaddress','decUserName'],
             // 管理员退款
             'adminRefund' => ['sn'],
             // AMP
@@ -820,11 +817,6 @@ class OrderForm extends Model
      * @throws Exception
      * @throws \yii\db\Exception
      */
-    private function getReconsumeActorId()
-    {
-        return $this->scenario === 'noLoginReconsumeOrder' ? $this->noLoginUserId : \Yii::$app->user->id;
-    }
-
     public function reconsumeAdd(){
         if(!$this->validate()){
             return null;
@@ -847,17 +839,16 @@ class OrderForm extends Model
         }
 
         // 报单中心汇率
-        $reconsumeActorId = $this->getReconsumeActorId();
-        $decCountryId = User::getEnCodeInfo($reconsumeActorId)['COUNTRY_ID'];
+        $decCountryId = User::getEnCodeInfo(\Yii::$app->user->id)['COUNTRY_ID'];
         $decCountry = Countries::getById($decCountryId);
         $decUserCurrencyRate = CurrencyConversions::getToUSDRate($decCountry['LOCAL_CURRENCY_ID']);
         // 会员汇率
         $country = Countries::getById($user['COUNTRY_ID']);
         $currencyRate = CurrencyConversions::getToUSDRate($country['LOCAL_CURRENCY_ID']);
         //判断是否是报单中心
-        $loginUser = User::getEnCodeInfo($reconsumeActorId);
+        $loginUser = User::getEnCodeInfo(\Yii::$app->user->id);
         if($loginUser['IS_DEC'] == 1){
-            if($decUserID != $reconsumeActorId){
+            if($decUserID != \Yii::$app->user->id){
                 throw new Exception(Yii::t('app', 'decUserNameIsWrong'));
             }
         }
@@ -984,7 +975,7 @@ class OrderForm extends Model
         $db = \Yii::$app->db;
         $transaction = $db->beginTransaction();
         try {
-            $loginUserId = $reconsumeActorId;
+            $loginUserId = \Yii::$app->user->id;
 
             //是否开启伞下会员限制
             // $isResaleUmbrella = Cache::getSystemConfig()['isResaleUmbrella']['VALUE'];
@@ -1069,7 +1060,7 @@ class OrderForm extends Model
         $nowPeriodNum = $periodObj->getNowPeriodNum();
         $nowCalcMonth = $periodObj->getYearMonth($nowPeriodNum);
         //帮复消会员Id（登陆会员）
-        $loginUserId = $this->getReconsumeActorId();
+        $loginUserId = \Yii::$app->user->id;
         $loginUserName = Info::getUserNameByUserId($loginUserId);
         //订单会员Id
         $userId = Info::getUserIdByUserName($this->userName);

frontendApi/modules/v1/controllers/ShopController.php

@@ -985,16 +985,17 @@ class ShopController extends BaseController {
             return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
         }
 
-        $formModel = new OrderForm();
+        $formModel = new ApproachReconsumeOrderForm();
         $formModel->scenario = 'noLoginReconsumeOrder';
         $formModel->remark = Yii::t('app', 'reconsume');
         $formModel->noLoginUserId = $user['ID'];
         $post['type'] = DeclarationForm::TYPE_FX;
+        $post['payType'] = 'pay_stack';
         if ($formModel->load($post, '')) {
             $formModel->userName = $user['USER_NAME'];
             $formModel->decUserName = $user['USER_NAME'];
-            if ($formModel->reconsumeAdd()) {
-                return static::notice(Yii::t('app', 'reconsumeSuccessfully'));
+            if ($order = $formModel->add()) {
+                return static::notice($order);
             }
         }