diff --git a/api/controllers/plan/Plan.php b/api/controllers/plan/Plan.php
index 51be95f5..d23ccc2a 100644
--- a/api/controllers/plan/Plan.php
+++ b/api/controllers/plan/Plan.php
@@ -39,7 +39,7 @@ class Plan extends CI_Controller
$plan[] = array('url' => base_url(array('plan', 'biz', 'settle')), 'interval' => 1);
$plan[] = array('url' => base_url(array('plan', 'order', 'up_old_status')), 'interval' => 30); //更新旧订单状态
- $plan[] = array('url' => base_url(array('plan', 'order', 'order_time')), 'interval' => 10); //未支付订单过期
+ $plan[] = array('url' => base_url(array('plan', 'order', 'out_time')), 'interval' => 10); //未支付订单过期
$this->plan = $plan;
}
diff --git a/api/controllers/wxapp/app/City.php b/api/controllers/wxapp/app/City.php
index e7af6153..58760847 100644
--- a/api/controllers/wxapp/app/City.php
+++ b/api/controllers/wxapp/app/City.php
@@ -17,6 +17,7 @@ class City extends Wxapp{
$this->check_mobile = array();//需要手机号
$this->check_headimg =array();//授权微信信息
$this->load->model("sys/sys_city_model");
+ $this->load->model("sys/sys_area_model");
$this->load->model("biz/biz_model");
}
@@ -59,5 +60,17 @@ class City extends Wxapp{
'default' => $default_city
];
return $data;
- }
+ }
+ //上牌城市
+ public function get_oncard(){
+ $where = [
+ 'province_id' => 350,
+ 'status' => 1
+ ];
+ $lists = $this->sys_area_model->select_groupby('city_id',$where,'','','','city_id,city_name as name');
+ $data = [
+ 'list' => $lists,
+ ];
+ return $data;
+ }
}
diff --git a/api/controllers/wxapp/liche/Protocol.php b/api/controllers/wxapp/liche/Protocol.php
index 1f35e7fe..38d6296b 100644
--- a/api/controllers/wxapp/liche/Protocol.php
+++ b/api/controllers/wxapp/liche/Protocol.php
@@ -221,7 +221,7 @@ require_once APPPATH.'controllers/wxapp/Wxapp.php';
if($res){
$this->orders_status_entity->set_status($row['id'],4,2);
$this->orders_status_entity->set_status($row['id'],5,1);
- $this->receiver_orders_v2_model->update(['status'=>1],['id'=>$row['id']]);
+ $this->receiver_orders_v2_model->update(['status'=>1,'ck_time'=>date('Y-m-d H:i:s')],['id'=>$row['id']]);
//完成分销
$this->deal_entity->deal_log_finish($row['id']);
throw new Exception('操作成功', API_CODE_SUCCESS);
diff --git a/api/controllers/wxapp/licheb/CusorderV2.php b/api/controllers/wxapp/licheb/CusorderV2.php
index 12b1ae85..8c6c82b7 100644
--- a/api/controllers/wxapp/licheb/CusorderV2.php
+++ b/api/controllers/wxapp/licheb/CusorderV2.php
@@ -78,8 +78,6 @@ class CusorderV2 extends Wxapp{
$c_credit = $this->input_param('credit');
$delry_time = $this->input_param('delry_time');
$finance_id = $this->input_param('finance_id');
- //$inten_money = floatval($this->input_param('inten_money'));//意向金
- $inten_money = 0;
$disc_money = floatval($this->input_param('disc_money'));//优惠金额
$disc_fine_money = floatval($this->input_param('disc_fine_money'));//精品优惠金额
$if_fine = $this->input_param('if_fine');
@@ -87,6 +85,8 @@ class CusorderV2 extends Wxapp{
$fines = $this->input_param('fines');
$address = $this->input_param('address');
$business_id = $this->input_param('business_id'); //商务政策id
+ $car_city_id = $this->input_param('c_city_id');//上牌城市
+ $pro = $this->input_param('pro'); //省市数组
$row = $this->customers_model->get(['id'=>$cus_id]);
$series_row = $this->auto_series_model->get(['id'=>$car_id]);
@@ -115,9 +115,6 @@ class CusorderV2 extends Wxapp{
if($deposit<2000){
throw new Exception('定金不得少于2000', ERR_PARAMS_ERROR);
}
- //if($inten_money >= $deposit){
- // throw new Exception('意向金不得高于定金', ERR_PARAMS_ERROR);
- //}
$biz = $this->biz_model->get(['id'=>$row['biz_id']],'city_id,type');
$car_row = $this->auto_cars_model->get(['brand_id'=>$series_row['brand_id'],'s_id'=>$series_row['id'],'v_id'=>$v_id],'',$biz['city_id']);
@@ -162,12 +159,17 @@ class CusorderV2 extends Wxapp{
$delry_time && $data['delry_time'] = $delry_time;
$fines && $data['fines'] = json_encode($fines,JSON_UNESCAPED_UNICODE);
$info_json = [];
+ if($pro){
+ $info_json['pro'] = $pro;
+ $address = implode(' ',$pro).$address;
+ }
$address && $info_json['c_address'] = $address;
$cardid && $info_json['c_cardid'] = $cardid;
$owner_cardid && $info_json['c_owner_cardid'] = $owner_cardid;
$c_credit && $info_json['c_credit'] = $c_credit;
$company && $info_json['c_company'] = $company;
$business_id && $info_json['business_id'] = $business_id;
+ $car_city_id && $info_json['car_city_id'] = $car_city_id;
$info_json && $data['info_json'] = json_encode($info_json,JSON_UNESCAPED_UNICODE);
$finance_row && $data['finance_id'] = $finance_row['id'];
@@ -183,7 +185,7 @@ class CusorderV2 extends Wxapp{
'price_insure' => $car_row['price_insure'],
'price_fine' => $car_row['price_fine'],
'price_discount' =>$disc_money ? $disc_money : 0,
- 'price_intention' => $inten_money ? $inten_money : 0,
+ 'price_intention' => 0,
'price_fine_discount' => $disc_fine_money ? $disc_fine_money : 0,
'price_fine_select' => 0,
'price_color' => $price_color,
@@ -211,11 +213,7 @@ class CusorderV2 extends Wxapp{
$o_id = $this->orders_model->add($data);
if($o_id){
- //意向金订单
$userinfo = $this->app_liche_users_model->get(['mobile'=>$data['mobile']],'id');
- if($inten_money){
- $this->orders_v2_entity->c_intention($o_id,$userinfo['id'],$inten_money);
- }
$this->orders_v2_entity->add_book_order($o_id,$userinfo['id']);
if($payway){ //全款服务费和尾款订单
$this->orders_v2_entity->add_order($o_id,$userinfo['id']);
@@ -241,6 +239,9 @@ class CusorderV2 extends Wxapp{
$main_type = $this->input_param('main_type');
$company = $this->input_param('company');
$c_credit = $this->input_param('credit');
+ $address = $this->input_param('address');
+ $car_city_id = $this->input_param('c_city_id');//上牌城市
+ $pro = $this->input_param('pro'); //省市数组
$inten_money = floatval($this->input_param('inten_money'));//意向金
@@ -273,10 +274,16 @@ class CusorderV2 extends Wxapp{
$owner_name && $data['owner_name'] = $owner_name;
$owner_mobile && $data['owner_mobile'] = $owner_mobile;
$info_json = [];
+ if($pro){
+ $info_json['pro'] = $pro;
+ $address = implode(' ',$pro).$address;
+ }
+ $address && $info_json['c_address'] = $address;
$cardid && $info_json['c_cardid'] = $cardid;
$owner_cardid && $info_json['c_owner_cardid'] = $owner_cardid;
$company && $info_json['c_company'] = $company;
$c_credit && $info_json['c_credit'] = $c_credit;
+ $car_city_id && $info_json['car_city_id'] = $car_city_id;
$info_json && $data['info_json'] = json_encode($info_json,JSON_UNESCAPED_UNICODE);
$money_json['price_intention'] = $inten_money ? $inten_money : 0;
@@ -490,7 +497,10 @@ class CusorderV2 extends Wxapp{
if($inten_row['status']==1){//已支付意向金
$inten_money = floatval($inten_row['total_price']);
}
-
+ if($info_json['pro']){
+ $pro_str = implode(" ",$info_json['pro']);
+ $info_json['c_address'] = str_replace($pro_str," ",$info_json['c_address']);
+ }
$data = [
'id' => $id,
'name' => $row['name'],
@@ -516,7 +526,9 @@ class CusorderV2 extends Wxapp{
'if_fine' => $row['if_fine'] ? 1 : 0,
'main_type' => intval($row['main_type']),
'fines' => $row['fines'] ? json_decode($row['fines'],true) : [],
- 'address' => $info_json['c_address'] ? $info_json['c_address'] : ''
+ 'address' => $info_json['c_address'] ? $info_json['c_address'] : '',
+ 'pro' => $info_json['pro'] ? $info_json['pro'] : [],
+ 'c_city_id' => $info_json['car_city_id']
];
if($row['main_type']){
$info_json['c_credit'] && $data['credit'] = $info_json['c_credit'];
@@ -564,6 +576,7 @@ class CusorderV2 extends Wxapp{
'value' => $loan_row['lend_file'] ? $loan_row['lend_file'] : ''
];
$data['price_loan'] = $money_json['price_loan'] ? $money_json['price_loan'] : 0.00;
+ $data['num'] = $loan_row['num'] ? $loan_row['num'] : 0;
$data['admin_name'] = '';
if($row['sale_id']){
$admin_row = $this->app_user_model->get(['id'=>$row['sale_id']],'uname');
@@ -782,6 +795,8 @@ class CusorderV2 extends Wxapp{
$company = $this->input_param('company');
$c_credit = $this->input_param('credit');
$address = $this->input_param('address');
+ $car_city_id = $this->input_param('c_city_id');
+ $pro = $this->input_param('pro');
$row = $this->orders_model->get(['id'=>$id]);
if(!$row){
@@ -794,7 +809,12 @@ class CusorderV2 extends Wxapp{
$owner_cardid && $info_json['c_owner_cardid'] = $owner_cardid;
$c_credit && $info_json['c_credit'] = $c_credit;
$company && $info_json['c_company'] = $company;
+ if($pro){
+ $info_json['pro'] = $pro;
+ $address = implode(' ',$pro).$address;
+ }
$address && $info_json['c_address'] = $address;
+ $car_city_id && $info_json['car_city_id'] = $car_city_id;
$info_json && $data['info_json'] = json_encode($info_json,JSON_UNESCAPED_UNICODE);
$result = $this->orders_model->update($data,['id'=>$row['id']]);
if($result){
diff --git a/api/controllers/wxapp/licheb/Finance.php b/api/controllers/wxapp/licheb/Finance.php
index 8273d7dc..fa86b3e8 100644
--- a/api/controllers/wxapp/licheb/Finance.php
+++ b/api/controllers/wxapp/licheb/Finance.php
@@ -48,52 +48,10 @@ class Finance extends Wxapp{
return $data;
}
- protected function get_nums(){ //废弃
+ protected function get_nums(){
+ $list = $this->sys_finance_model->get_nums();
$data = [
- 'list' => [],
- 'total' => 0
- ];
- return $data;
- $car_id = $this->input_param('car_id');
- $color_id = $this->input_param('color_id');
- $incolor_id = $this->input_param('incolor_id');
- $v_id = $this->input_param('v_id');
- $finance_id = $this->input_param('finance_id');
- $page = $this->input_param('page');
- $size = $this->input_param('size');
-
- !$page && $page = 1;
- !$size && $size = 10;
-
- $series_row = $this->auto_series_model->get(['id'=>$car_id],'id,brand_id');
- $row = $this->auto_finance_model->get(['id'=>$finance_id],'id');
- if(!$series_row || !$row){
- throw new Exception('参数错误', ERR_PARAMS_ERROR);
- }
- $car_row = $this->auto_cars_model->get(['brand_id'=>$series_row['brand_id'],'s_id'=>$series_row['id'],'v_id'=>$v_id],'id,price_car');
-
- $where = [
- 'car_id' => $car_row['id'],
- 'fin_id' => $row['id'],
- 'status' => 1
- ];
- $count = $this->auto_finance_model->count($where);
- $lists = [];
- if($count){
- $rows = $this->auto_finance_model->select($where,'id desc',$page,$size,'id,num,first_pay,month_pay');
- foreach($rows as $key => $val){
- $loan_money = $car_row['price_car'] - $val['first_pay'];
- $lists[] = [
- 'id' => $val['id'],
- 'num' => $val['num'],
- 'loan_money' => $loan_money,
- 'month_pay' => $val['month_pay']
- ];
- }
- }
- $data = [
- 'list' => $lists,
- 'total' => $count
+ 'list' => $list,
];
return $data;
diff --git a/api/controllers/wxapp/licheb/Loan.php b/api/controllers/wxapp/licheb/Loan.php
index a2915ad5..3e310bc2 100644
--- a/api/controllers/wxapp/licheb/Loan.php
+++ b/api/controllers/wxapp/licheb/Loan.php
@@ -40,6 +40,7 @@ class Loan extends Wxapp{
$notify_file = $this->input_param('notify_file');
$lend_file = $this->input_param('lend_file');
$price_loan = $this->input_param('price_loan');
+ $num = $this->input_param('num');
$order_row = $this->receiver_orders_v2_model->get(['id' => $oid], 'id,mobile,money_json,payway');
@@ -76,6 +77,7 @@ class Loan extends Wxapp{
'notify_file' => $notify_file
];
$lend_file && $update['lend_file'] = $lend_file;
+ $num && $update['num'] = $num;
$update && $result = $this->order_loans_model->update($update, ['id' => $row['id']]);
throw new Exception('保存成功', API_CODE_SUCCESS);
}