bugfix: EK-1569: 报单时无法使用PayStack支付.

common/models/User.php

@@ -241,16 +241,9 @@ class User extends \common\components\ActiveRecord
      * @param $userId
      * @return array|null|\yii\db\ActiveRecord
      */
-    public static function getBaseInfoFromRedis($userId){
-        //$userInfo = Yii::$app->redis->hget(Cache::USER_INFO_KEY, $userId);
-//        $userInfo = '';
-//        if(!$userInfo){
-            $userInfo = static::find()->select('ID,USER_NAME,NATION,COUNTRY_ID,LANGUAGE_ID,REAL_NAME,ID_CARD,ID_TYPE,MOBILE,ADDRESS,STATUS,DEC_LV,LAST_DEC_LV,EMP_LV,ELITE_LV,DEC_CLOSED,AVATAR,OPEN_BANK,BANK_ADDRESS,BANK_NO,VERIFIED,IS_UNION,IS_DEC,IS_ATLAS,IS_RECHARGE,IS_STUDIO,DEC_ROLE_ID,PROVINCE,CITY,COUNTY,EMAIL')->where('ID=:ID', [':ID'=>$userId])->asArray()->one();
-            Yii::$app->redis->hset(Cache::USER_INFO_KEY, $userId, Json::encode($userInfo));
-//        } else {
-//            $userInfo = Json::decode($userInfo);
-//        }
-        return $userInfo;
+    public static function getBaseInfoFromRedis($userId)
+    {
+        return static::find()->select('ID,USER_NAME,NATION,COUNTRY_ID,LANGUAGE_ID,REAL_NAME,ID_CARD,ID_TYPE,MOBILE,ADDRESS,STATUS,DEC_LV,LAST_DEC_LV,EMP_LV,ELITE_LV,DEC_CLOSED,AVATAR,OPEN_BANK,BANK_ADDRESS,BANK_NO,VERIFIED,IS_UNION,IS_DEC,IS_ATLAS,IS_RECHARGE,IS_STUDIO,DEC_ROLE_ID,PROVINCE,CITY,COUNTY,EMAIL')->where('ID=:ID', [':ID'=>$userId])->asArray()->one();
     }
 
     /**

common/models/forms/ApproachReconsumeOrderForm.php

@@ -101,8 +101,8 @@ class ApproachReconsumeOrderForm extends Model
     public function rules()
     {
         return [
-            [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','userName','consignee','acceptMobile','province',/*'city','county',*/'lgaName','cityName','detailaddress','email'], 'trim'],
-            [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','consignee','acceptMobile','province','city','county','detailaddress'/*,'email'*/,'decUserName'], 'required'],
+            [['sn', 'expressCompany', 'orderTrackNo', 'status','type','addressId','payType','goodsId','goodsNum', 'payPassword','userName','consignee','acceptMobile','province',/*'city','county',*/'lgaName','cityName','detailaddress','email'], 'trim'],
+            [['sn', 'expressCompany', 'orderTrackNo', 'status','type','addressId','payType','goodsId','goodsNum', 'payPassword','consignee','acceptMobile','province','city','county','detailaddress'/*,'email'*/,'decUserName'], 'required'],
             [['status'], 'isStatus'],
             [['addressId'], 'isAddress'],
             [['payType'], 'isPayType'],
@@ -117,7 +117,6 @@ class ApproachReconsumeOrderForm extends Model
             'expressCompany' => Yii::t('app', 'expressCompany'),
             'orderTrackNo' => Yii::t('app', 'orderTrackNo'),
             'status' => Yii::t('app', 'state'),
-            'remark' => Yii::t('app', 'remark'),
             'type' => Yii::t('app', 'orderType'),
             'addressId' => Yii::t('app', 'shippingAddress'),
             'payType' => Yii::t('app', 'payType'),
@@ -150,8 +149,8 @@ class ApproachReconsumeOrderForm extends Model
             'verifyPayStack' => ['sn', 'note', 'status'],
             // 会员下单
             'userOrder' => ['type','addressId', 'payType','goodsId','goodsNum', 'note', 'payPassword'],
-            // 为会员复消
-            'reconsumeOrder' => ['type','userName', 'payType','goodsId','goodsNum', 'remark', 'payPassword','consignee','acceptMobile','province','cityName','lgaName','detailaddress'],
+            // 帮会员复消下单
+            'reconsumeOrder' => ['type','userName', 'payType','goodsId','goodsNum', 'remark', 'payPassword','consignee','acceptMobile','province','cityName','lgaName','detailaddress','decUserName'],
         ];
         return array_merge($parentScenarios, $customScenarios);
     }