Merge branch 'master' of ssh://code.srdcloud.cn:29418/fsdxszhpt/yzms
This commit is contained in:
commit
6f84de4e6e
|
@ -57,13 +57,6 @@ class Order extends REST_Controller
|
||||||
|
|
||||||
$total_price = $this->input->post('total_price');
|
$total_price = $this->input->post('total_price');
|
||||||
$notes = $this->input->post('notes');
|
$notes = $this->input->post('notes');
|
||||||
if(empty($notes)){
|
|
||||||
$this->response(array(
|
|
||||||
'status' => 0,
|
|
||||||
'message' => '请先填写备注',
|
|
||||||
'data' => $data
|
|
||||||
), REST_Controller::HTTP_OK);
|
|
||||||
}
|
|
||||||
if ($this->user->type_id != USERTYPE_OFFICIAL) {
|
if ($this->user->type_id != USERTYPE_OFFICIAL) {
|
||||||
if (floatval($total_price) >= 0) {
|
if (floatval($total_price) >= 0) {
|
||||||
} else {
|
} else {
|
||||||
|
@ -526,13 +519,7 @@ class Order extends REST_Controller
|
||||||
|
|
||||||
$total_price = $this->input->post('total_price');
|
$total_price = $this->input->post('total_price');
|
||||||
$notes = $this->input->post('notes');
|
$notes = $this->input->post('notes');
|
||||||
if(empty($notes)){
|
|
||||||
$this->response(array(
|
|
||||||
'status' => 0,
|
|
||||||
'message' => '请先填写备注',
|
|
||||||
'data' => $data
|
|
||||||
), REST_Controller::HTTP_OK);
|
|
||||||
}
|
|
||||||
if ($this->user->type_id != USERTYPE_OFFICIAL) {
|
if ($this->user->type_id != USERTYPE_OFFICIAL) {
|
||||||
if (floatval($total_price) >= 0) {
|
if (floatval($total_price) >= 0) {
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue