|
@@ -566,9 +566,9 @@ class ApproachReconsumeOrderForm extends Model
|
|
|
$loginUserId = $reconsumeActorId;
|
|
$loginUserId = $reconsumeActorId;
|
|
|
|
|
|
|
|
//写入订单
|
|
//写入订单
|
|
|
- if (!$orderResult = $this->addOrder()) {
|
|
|
|
|
- throw new Exception(Form::formatErrorsForApi($orderResult->getErrors()));
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// if (!$orderResult = $this->addOrder()) {
|
|
|
|
|
+// throw new Exception(Form::formatErrorsForApi($orderResult->getErrors()));
|
|
|
|
|
+// }
|
|
|
|
|
|
|
|
//是否开启伞下会员限制
|
|
//是否开启伞下会员限制
|
|
|
// $isResaleUmbrella = Cache::getSystemConfig()['isResaleUmbrella']['VALUE'];
|
|
// $isResaleUmbrella = Cache::getSystemConfig()['isResaleUmbrella']['VALUE'];
|
|
@@ -679,7 +679,7 @@ class ApproachReconsumeOrderForm extends Model
|
|
|
$orderModel->ADDRESS = $this->detailaddress;
|
|
$orderModel->ADDRESS = $this->detailaddress;
|
|
|
$orderModel->FRONT_REMARK = $this->remark;
|
|
$orderModel->FRONT_REMARK = $this->remark;
|
|
|
$orderModel->WAREHOUSE = $warehouse;
|
|
$orderModel->WAREHOUSE = $warehouse;
|
|
|
- $orderModel->STATUS = 1;
|
|
|
|
|
|
|
+ $orderModel->STATUS = $this->payType == 'pay_stack'?0:1;
|
|
|
$orderModel->CREATED_AT = Date::nowTime();
|
|
$orderModel->CREATED_AT = Date::nowTime();
|
|
|
$orderModel->CREATE_USER = $loginUserName;
|
|
$orderModel->CREATE_USER = $loginUserName;
|
|
|
$orderModel->EMAIL = $email ?? '';
|
|
$orderModel->EMAIL = $email ?? '';
|