|
|
@@ -655,14 +655,7 @@ class ApproachReconsumeOrderForm extends Model
|
|
|
$country = Countries::getById($user['COUNTRY_ID']);
|
|
|
|
|
|
// 加入订单信息
|
|
|
- if ($this->_address['PROVINCE'] != 1) {
|
|
|
- $warehouse = Region::getWarehouseByCode($this->_address['PROVINCE']);//仓库
|
|
|
- if (!$warehouse) {
|
|
|
- throw new Exception(Yii::t('app', 'deliveryTemporarilyNotSupported'));
|
|
|
- }
|
|
|
- }else{
|
|
|
- $warehouse = '01';
|
|
|
- }
|
|
|
+ $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;
|
|
|
|