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

common/models/forms/ApproachReconsumeOrderForm.php

@@ -645,66 +645,54 @@ class ApproachReconsumeOrderForm extends Model
         $nowPeriodNum = $periodObj->getNowPeriodNum();
         $nowCalcMonth = $periodObj->getYearMonth($nowPeriodNum);
 
-        $userId = \Yii::$app->user->id;
-        $user = User::getEnCodeInfo(\Yii::$app->user->id);
-
-        $userName = Info::getUserNameByUserId($userId);
-        $userRealName = Info::getUserRealNameByUserId($userId);
-        $userMobile = Info::getUserMobileByUserId($userId);
-        $userEmail = Info::getUserEmailByUserId($userId);
-        $country = Countries::getById($user['COUNTRY_ID']);
+        //帮复消会员Id（登陆会员）
+        $loginUserId = \Yii::$app->user->id;
+        $loginUserName = Info::getUserNameByUserId($loginUserId);
+        //订单会员Id
+        $userId = Info::getUserIdByUserName($this->userName);
+        $countryId = Info::getUserCountryByUserId($userId);
+        $email = Info::getEmailByUserId($this->userName);
+        $country = Countries::getById($countryId);
 
-        // 加入订单信息
         $warehouse = '01';
-        $_hasPV = in_array($this->payType, ['exchange', 'tourism_points', 'garage_points']) ? 0 : $this->_decPv;
-        $_hasRealPV = in_array($this->payType, ['exchange', 'tourism_points', 'garage_points']) ? 0 : $this->_realPv;
 
         $ordNo = $this->_generateSn();
         $orderModel = new ApproachReconsumeOrder();
         $orderModel->SN = 'OS'.$ordNo;
         $orderModel->DEC_SN = 'DS'.$ordNo;
         $orderModel->ORDER_TYPE = $this->type;
+        $orderModel->ORDER_CATEGORY = 'STUDIO';
         $orderModel->USER_ID = $userId;
-        $orderModel->USER_NAME = $userName;
-        $orderModel->DEC_USER_ID = $this->decUserName;;
+        $orderModel->USER_NAME = $this->userName;
         $orderModel->ORDER_AMOUNT = $this->_decAmount;
-        $orderModel->PV = $_hasPV;
+        $orderModel->PV = $this->payType == 'prp' ? 0 : $this->_decPv;
         $orderModel->PAY_AMOUNT = $this->_payAmount;
-        $orderModel->PAY_PV = $this->payType == 'prp' ? 0 : $_hasRealPV; // 兑换积分不能算业绩
+        $orderModel->PAY_PV = $this->payType == 'prp' ? 0 : $this->_decPv;
         $orderModel->PAY_AT = Date::nowTime();
         $orderModel->PAY_TYPE = $this->payType;
         $orderModel->PERIOD_NUM = $nowPeriodNum;
         $orderModel->P_CALC_MONTH = Date::ociToDate($nowCalcMonth, Date::OCI_TIME_FORMAT_SHORT_MONTH);
         $orderModel->FREIGHT = $this->_freight;
         $orderModel->PAY_FREIGHT = $this->_freight;
-        $orderModel->CONSIGNEE = $this->_address['CONSIGNEE'];
-        $orderModel->MOBILE = $this->_address['MOBILE'];
-        $orderModel->PROVINCE = $this->_address['PROVINCE'];
-        $orderModel->LGA_NAME = $this->_address['LGA_NAME'];
-        $orderModel->CITY_NAME = $this->_address['CITY_NAME'];
-        $orderModel->ADDRESS = $this->_address['ADDRESS'];
+        $orderModel->CONSIGNEE = $this->consignee;
+        $orderModel->MOBILE = $this->acceptMobile;
+        $orderModel->PROVINCE = $this->province[0];
+        $orderModel->LGA_NAME = $this->lgaName;
+        $orderModel->CITY_NAME = $this->cityName;
+        $orderModel->ADDRESS = $this->detailaddress;
         $orderModel->FRONT_REMARK = $this->remark;
         $orderModel->WAREHOUSE = $warehouse;
-        $orderModel->STATUS = \Yii::$app->params['orderStatus']['paid']['value'];
+        $orderModel->STATUS = 1;
         $orderModel->CREATED_AT = Date::nowTime();
-        $orderModel->CREATE_USER = $userName;
-        $orderModel->EMAIL = $userEmail ?? '';
+        $orderModel->CREATE_USER = $loginUserName;
+        $orderModel->EMAIL = $email ?? '';
         $orderModel->ORDER_AMOUNT_STANDARD = $this->_decAmountStandard;
         $orderModel->PAY_AMOUNT_STANDARD = $this->_standardAmount;
         $orderModel->EXCHANGE_RATE = $this->exchangeRate;
-        $orderModel->COUNTRY_ID = $user['COUNTRY_ID'];
+        $orderModel->COUNTRY_ID = $countryId;
         $orderModel->CURRENCY_ID = $country['LOCAL_CURRENCY_ID'] ?? 0;
-        if($this->_address['PROVINCE']==1){
-            $orderModel->EXPRESS_TYPE = 1;
-            $orderModel->CONSIGNEE = $userRealName;
-            $orderModel->MOBILE = $userMobile;
-            $orderModel->PROVINCE = 1;
-            $orderModel->CITY = 1;
-            $orderModel->COUNTY = 1;
-            $orderModel->LGA_NAME = $this->_address['LGA_NAME'];
-            $orderModel->CITY_NAME = $this->_address['CITY_NAME'];
-            $orderModel->ADDRESS = 'Self Pick-up';
-        }
+        $orderModel->DEC_USER_ID = $this->decUserName;
+        $orderModel->AUTO_MAINTENANCE = $this->autoMaintenance ?? 0;
         if(!$orderModel->save()){
             throw new Exception(Form::formatErrorsForApi($orderModel->getErrors()));
         }