From 91b16bb314dbf1ac65689e2dc60f92ce9122c77e Mon Sep 17 00:00:00 2001 From: lccsw <1127794702@qq.com> Date: Tue, 16 Nov 2021 15:20:05 +0800 Subject: [PATCH] edit-admin-order_loan --- admin/controllers/receiver/Orders.php | 4 ++-- common/models/sys/Sys_finance_model.php | 2 +- common/services/apporder/Payment_service.php | 2 +- sql/receiver/order.sql | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php index 0f80d2bc..755f42c9 100644 --- a/admin/controllers/receiver/Orders.php +++ b/admin/controllers/receiver/Orders.php @@ -172,9 +172,9 @@ class Orders extends HD_Controller if ($money_json['price_loan']) { $srv_money = $this->orders_entity->order_srv_money($row['id']); if ($srv_money > $deposit) { - $loan['first_pay'] = $money_json['price_car'] - $money_json['price_loan']; + $loan['first_pay'] = $sale_price - $money_json['price_loan']; } else { - $loan['first_pay'] = $money_json['price_car'] - $money_json['price_loan'] - $deposit; + $loan['first_pay'] = $sale_price - $money_json['price_loan'] - $deposit; } } !$loan['num'] && $loan['num'] = 12; diff --git a/common/models/sys/Sys_finance_model.php b/common/models/sys/Sys_finance_model.php index 60b476a5..ecff0a47 100644 --- a/common/models/sys/Sys_finance_model.php +++ b/common/models/sys/Sys_finance_model.php @@ -50,7 +50,7 @@ class Sys_finance_model extends HD_Model * @return array */ public function get_nums(){ - $nums = [12,24,36,48,60]; + $nums = [12,18,24,36,48,60]; return $nums; } } diff --git a/common/services/apporder/Payment_service.php b/common/services/apporder/Payment_service.php index 7abcacab..acddbb81 100644 --- a/common/services/apporder/Payment_service.php +++ b/common/services/apporder/Payment_service.php @@ -160,7 +160,7 @@ class Payment_service extends HD_Service{ $this->load->model('receiver/order/receiver_order_loans_model', 'next_model'); } $next_row = $this->next_model->get(['o_id'=>$row['id']]); - $this->orders_model->update(['status' => $status], ['id' => $row['id']]); + $this->orders_model->update(['status' => $status,'order_time' => date('Y-m-d H:i:s')], ['id' => $row['id']]); if(!$next_row){ $add_data = [ 'o_id' => $row['id'], diff --git a/sql/receiver/order.sql b/sql/receiver/order.sql index 7f76bc7b..cf993e7c 100644 --- a/sql/receiver/order.sql +++ b/sql/receiver/order.sql @@ -198,3 +198,4 @@ alter table lc_receiver_orders add money_json json default null comment "价格j alter table lc_receiver_orders add srv_ids varchar(100) not null default '' comment '服务id多个逗号隔开' after pack_id; alter table lc_receiver_orders add fine_ids varchar(100) not null default '' comment '精品id多个逗号隔开' after srv_ids; alter table lc_receiver_orders add bill_time timestamp not null default '0000-00-00 00:00:00' comment '开票时间' after delry_time; +alter table lc_receiver_orders add order_time timestamp not null default '0000-00-00 00:00:00' comment '下定时间' after bill_time;