|
|
@@ -93,8 +93,8 @@ class OrderForm extends Model
|
|
|
public function rules()
|
|
|
{
|
|
|
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','consignee','acceptMobile','province','city','county','detailaddress'/*,'email'*/], 'required'],
|
|
|
+ [['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', 'payPassword','consignee','acceptMobile','province','city','county','detailaddress'/*,'email'*/,'decUserName'], 'required'],
|
|
|
[['status'], 'isStatus'],
|
|
|
[['addressId'], 'isAddress'],
|
|
|
[['payType'], 'isPayType'],
|
|
|
@@ -125,6 +125,7 @@ class OrderForm extends Model
|
|
|
'cityName' => Yii::t('app', 'cityName'),
|
|
|
'detailaddress' => Yii::t('app', 'detailAddress'),
|
|
|
'email' => Yii::t('app', 'email'),
|
|
|
+ 'decUserName' => Yii::t('app', 'decUserName'),
|
|
|
];
|
|
|
}
|
|
|
|
|
|
@@ -148,7 +149,7 @@ 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'],
|
|
|
+ 'reconsumeOrder' => ['type','userName', 'payType','goodsId','goodsNum', 'remark', 'payPassword','consignee','acceptMobile','province','cityName','lgaName','detailaddress','decUserName'],
|
|
|
// 管理员退款
|
|
|
'adminRefund' => ['sn'],
|
|
|
];
|
|
|
@@ -827,6 +828,12 @@ class OrderForm extends Model
|
|
|
$userId = Info::getUserIdByUserName($this->userName);
|
|
|
$user = User::getEnCodeInfo($userId);
|
|
|
|
|
|
+ $decUserID = Info::getUserIdByUserName($this->decUserName);
|
|
|
+ $stockist_user = User::getEnCodeInfo($decUserID);
|
|
|
+ if(!$stockist_user){
|
|
|
+ throw new Exception(Yii::t('app', 'stockistDoesNotExist'));
|
|
|
+ }
|
|
|
+
|
|
|
// 报单中心汇率
|
|
|
$decCountryId = User::getEnCodeInfo(\Yii::$app->user->id)['COUNTRY_ID'];
|
|
|
$decCountry = Countries::getById($decCountryId);
|
|
|
@@ -834,6 +841,13 @@ class OrderForm extends Model
|
|
|
// 会员汇率
|
|
|
$country = Countries::getById($user['COUNTRY_ID']);
|
|
|
$currencyRate = CurrencyConversions::getToUSDRate($country['LOCAL_CURRENCY_ID']);
|
|
|
+ //判断是否是报单中心
|
|
|
+ $loginUser = User::getEnCodeInfo(\Yii::$app->user->id);
|
|
|
+ if($loginUser['IS_DEC'] == 1){
|
|
|
+ if($decUserID != \Yii::$app->user->id){
|
|
|
+ throw new Exception(Yii::t('app', 'decUserNameIsWrong'));
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
foreach ($this->goodsNum as $k => $v) {
|
|
|
if ($v) {
|
|
|
@@ -1093,6 +1107,7 @@ class OrderForm extends Model
|
|
|
$orderModel->EXCHANGE_RATE = $this->exchangeRate;
|
|
|
$orderModel->COUNTRY_ID = $countryId;
|
|
|
$orderModel->CURRENCY_ID = $country['LOCAL_CURRENCY_ID'] ?? 0;
|
|
|
+ $orderModel->DEC_USER_ID = $this->decUserName;;
|
|
|
if(!$orderModel->save()){
|
|
|
throw new Exception(Form::formatErrorsForApi($orderModel->getErrors()));
|
|
|
}
|