diff --git a/api/controllers/wxapp/app/Payment.php b/api/controllers/wxapp/app/Payment.php index e8b84856..5a5087d0 100644 --- a/api/controllers/wxapp/app/Payment.php +++ b/api/controllers/wxapp/app/Payment.php @@ -32,7 +32,7 @@ class Payment extends Wxapp{ if($row['total_price']>0){ $url = http_host_com('api'); $notify_url = $url."/wxapp/{$this->app_key}/wxnotify"; - $result = $this->pay($sid, $row['total_price'], $this->session['openid'], $row['item_title'], $notify_url); + $result = $this->pay($sid, $row['total_price']=0.01, $this->session['openid'], $row['item_title'], $notify_url); }else{ $this->load->service('apporder/payment_service', array('app_id' => $this->app_id)); $result = $this->payment_service->after_pay($sid); diff --git a/api/controllers/wxapp/licheb/Loan.php b/api/controllers/wxapp/licheb/Loan.php index 31010de4..e9b94e20 100644 --- a/api/controllers/wxapp/licheb/Loan.php +++ b/api/controllers/wxapp/licheb/Loan.php @@ -23,10 +23,10 @@ class Loan extends Wxapp{ protected function get(){ $banks = [ - '中国农行' + '易鑫金融 36期' ]; $years = [ - 1,2,3,4,5 + 3 ]; $data = [ 'banks' => $banks, diff --git a/api/controllers/wxapp/licheb/User.php b/api/controllers/wxapp/licheb/User.php index 3e39fe4d..3194da2c 100644 --- a/api/controllers/wxapp/licheb/User.php +++ b/api/controllers/wxapp/licheb/User.php @@ -119,7 +119,7 @@ class User extends Wxapp{ $unuse_count = $this->customers_model->count(['admin_id'=>0,'biz_id'=>$biz_id]); //为创建订单客户 - $uncre_count = $this->customers_model->count(['status'=>2,'admin_id'=>$uid,'biz_id'=>$biz_id]); + $uncre_count = $this->customers_model->count_order(['lc_receiver_customers.status'=>2,'lc_receiver_customers.admin_id'=>$uid,'lc_receiver_customers.biz_id'=>$biz_id,'lc_receiver_orders.id is null'=>null]); $t1 = 'lc_receiver_order_signs'; $t2 = 'lc_receiver_orders'; $need_sign = $this->order_signs_model->count_order(["$t1.status"=>0,"$t2.admin_id"=>$uid]);//需要签名 diff --git a/common/helpers/comm_helper.php b/common/helpers/comm_helper.php index ae27c692..b016b0c1 100644 --- a/common/helpers/comm_helper.php +++ b/common/helpers/comm_helper.php @@ -937,11 +937,11 @@ if (!function_exists('http_host_com')){ } } else { // 正式 if($type == 'api'){ - $url = 'https://api.lc.haodian.cn'; + $url = 'https://api.liche.cn'; } else if($type == 'home'){ $url = "https://www.liche.cn"; } else if($type == 'admin'){ - $url = "https://admin.lc.haodian.cn"; + $url = "https://admin.liche.cn"; } } return $url; diff --git a/common/models/receiver/order/Receiver_orders_model.php b/common/models/receiver/order/Receiver_orders_model.php index 2f161b71..97dfec9a 100644 --- a/common/models/receiver/order/Receiver_orders_model.php +++ b/common/models/receiver/order/Receiver_orders_model.php @@ -12,7 +12,7 @@ class Receiver_orders_model extends HD_Model { private $table_name = 'lc_receiver_orders'; - private $status_arr = [ 0 => '合同签订',1 => '办理分期',2 => '车辆确认',3 => '申请开票',4=>'代理服务',5 => '交付确认', 6 => '完成交付', 7 => '申请退款']; + private $status_arr = [ 0 => '合同签订',1 => '办理分期',2 => '车辆确认',3 => '申请开票',4=>'代办服务',5 => '交付确认', 6 => '完成交付', 7 => '申请退款']; public function __construct() {