From a83dc2e5cdb74242eea05b2fb12eef0a171bc00f Mon Sep 17 00:00:00 2001
From: lccsw <1127794702@qq.com>
Date: Tue, 9 Nov 2021 14:17:30 +0800
Subject: [PATCH] edit-api-contract
---
api/controllers/wxapp/licheb/Cusorder.php | 34 ++++++++++---------
api/controllers/wxapp/licheb/Protocol.php | 35 +++++++++++---------
api/views/wxapp/licheb/html2pdf/agent.php | 4 +--
api/views/wxapp/licheb/html2pdf/agent_sp.php | 2 +-
api/views/wxapp/licheb/html2pdf/car_fh.php | 2 +-
api/views/wxapp/licheb/protocol/agent.php | 4 +--
api/views/wxapp/licheb/protocol/agent_sp.php | 2 +-
api/views/wxapp/licheb/protocol/car_fh.php | 2 +-
8 files changed, 47 insertions(+), 38 deletions(-)
diff --git a/api/controllers/wxapp/licheb/Cusorder.php b/api/controllers/wxapp/licheb/Cusorder.php
index c5511b90..b6b15b8b 100644
--- a/api/controllers/wxapp/licheb/Cusorder.php
+++ b/api/controllers/wxapp/licheb/Cusorder.php
@@ -371,6 +371,9 @@ class Cusorder extends Wxapp{
throw new Exception('订单不存在', ERR_PARAMS_ERROR);
}
+ $money_json = json_decode($row['money_json'],true);
+ $info_json = json_decode($row['info_json'],true);
+
$brand = $this->auto_brand_model->get(['id'=>$row['brand_id']],'name');
$series = $this->auto_series_model->get(['id'=>$row['s_id']],'name');
$color = $this->auto_attr_model->get(['id'=>$row['cor_id']],'title');
@@ -399,24 +402,25 @@ class Cusorder extends Wxapp{
$srv_rows = $this->services_model->select(["id in ({$row['srv_ids']})"=>null],'','','','title');
$srv_rows && $pack_title = implode('+',array_column($srv_rows,'title'));
}
- $car_data = [
- '车辆名称' => $brand['name'].$series['name'],
- '车辆级别' => $version,
- '颜色' => $color,
- '车辆合同售价' => $row['price'],
- '定金' => $row['deposit'],
- '代办包' => $pack_title,
- '购车主体' => $row['main_type'] ? '公司' : '个人',
- '是否委托' => $row['ifentrust'] ? '是' : '否',
- ];
- $info_json = json_decode($row['info_json'],true);
- if($row['ifentrust']){
- $car_data['委托人姓名'] = $info_json['entrust_name'] ? $info_json['entrust_name'] : '';
- $car_data['委托人身份证'] = $info_json['entrust_idcard'] ? $info_json['entrust_idcard'] : '';
+ $car_data = [];
+ if($row['brand_id'] && $row['s_id'] && $row['v_id']){
+ $car_data['车辆名称'] = $brand['name'].$series['name'];
+ $car_data['车辆名称'] = $brand['name'].$series['name'];
+ $car_data['车辆级别'] = $version;
+ $car_data['颜色'] = $color;
+ $car_data['车辆合同售价'] = $money_json['price_discount'] ? $row['price']-$money_json['price_discount'] : $row['price'];
+ $money_json['price_discount'] && $car_data['优惠金额'] = $money_json['price_discount'];
+ $car_data['定金'] = $row['deposit'];
+ $car_data['代办包'] = $pack_title;
+ $car_data['购车主体'] = $row['main_type'] ? '公司' : '个人';
+ $car_data['是否委托'] = $row['ifentrust'] ? '是' : '否';
+ if($row['ifentrust']){
+ $car_data['委托人姓名'] = $info_json['entrust_name'] ? $info_json['entrust_name'] : '';
+ $car_data['委托人身份证'] = $info_json['entrust_idcard'] ? $info_json['entrust_idcard'] : '';
+ }
}
$info_json['c_address'] && $car_data['地址'] = $info_json['c_address'];
$info_json['c_cardid'] && $car_data['身份证号'] = $info_json['c_cardid'];
- $money_json = json_decode($row['money_json'],true);
if(!$row['payway']){
$finance_row = $this->sys_finance_model->get(['id'=>$row['finance_id']],'title');
$car_data['金融产品'] = $finance_row['title'];
diff --git a/api/controllers/wxapp/licheb/Protocol.php b/api/controllers/wxapp/licheb/Protocol.php
index 83a11f21..e9f678bb 100644
--- a/api/controllers/wxapp/licheb/Protocol.php
+++ b/api/controllers/wxapp/licheb/Protocol.php
@@ -93,7 +93,7 @@ class Protocol extends CI_Controller{
$id = $this->input->get('id');
$row = $this->orders_model->get(['id'=>$id]);
$contract = $this->contracts_model->get(['o_id'=>$id,'type'=>1]);
- $total_price = 0;
+ $srv_price = 0;
$services = [];
if($row){
$money_json = json_decode($row['money_json'],true);
@@ -102,18 +102,28 @@ class Protocol extends CI_Controller{
$row['company'] = $this->sys_company_model->get(["title like '%服务%'"=>null,'status'=>1]);
$is_insure = false;
if($row['srv_ids']){
- $services = $this->services_model->select(["id in ({$row['srv_ids']})"=>null],'','','','title');
+ $money_json = json_decode($row['money_json'],true);
+ $service_rows = $this->services_model->select(["id in ({$row['srv_ids']})"=>null],'','','','id,title,field_name');
+ foreach($service_rows as $key=>$val){
+ $field_arr = explode('.',$val['field_name']);
+ if(isset($money_json[$field_arr[1]])){ //保险费不收
+ $services[] = [
+ 'id' => $val['id'],
+ 'title' => $val['title'],
+ 'money' => $money_json[$field_arr[1]]
+ ];
+ }
+ }
+
$srv_id_arr = explode(',',$row['srv_ids']);
$is_insure = in_array(1,$srv_id_arr) ? true : false;
}
$this->load->library('receiver/orders_entity');
$srv_price = $this->orders_entity->order_srv_money($row['id']);
- $total_price = $srv_price;
- $is_insure && $total_price = $total_price + $money_json['price_insure'];
}
$row['is_insure'] = $is_insure;
$row['services'] = $services;
- $row['total_price'] = $total_price;
+ $row['srv_price'] = $srv_price;
$row['info_json'] = json_decode($row['info_json'],true);
$row['day'] = $contract ? date('Y年m月d日',$contract['c_time']):date('Y年m月d日');
$row['cid'] = $contract['cid'];
@@ -153,7 +163,7 @@ class Protocol extends CI_Controller{
$agent = $this->agents_model->get(['o_id'=>$id]);
$contract = $this->contracts_model->get(['o_id'=>$id,'type'=>3]);
$items = $this->items_model->get(['id'=>$row['item_id']],'vin');
- $total_price = 0;
+ $srv_price = 0;
if($row){
$money_json = json_decode($row['money_json'],true);
$money_json['price_discount'] && $row['price'] = $row['price'] - $money_json['price_discount'];
@@ -197,9 +207,9 @@ class Protocol extends CI_Controller{
$last_pay = $this->app_liche_orders_model->sum('total_price',$where);
$row['pay_price'] = $pay['total_price'] + $last_pay['total_price'];
$this->load->library('receiver/orders_entity');
- $total_price = $this->orders_entity->order_srv_money($row['id']);
+ $srv_price = $this->orders_entity->order_srv_money($row['id']);
}
- $row['total_price'] = $total_price;
+ $row['srv_price'] = $srv_price;
$row['agent'] = $agent;
$row['day'] = $contract ? date('Y年m月d日',$contract['c_time']):date('Y年m月d日');
$row['cid'] = $contract['cid'];
@@ -316,7 +326,7 @@ class Protocol extends CI_Controller{
$row = $this->orders_model->get(['id'=>$id]);
$row['old_contract'] = $this->contracts_model->get(['o_id'=>$id,'type'=>1]);
$contract = $this->contracts_model->get(['o_id'=>$id,'type'=>5]);
- $total_price = 0;
+ $srv_price = 0;
$old_services = $services = '';
if($row){
//获取修改前数据
@@ -326,12 +336,9 @@ class Protocol extends CI_Controller{
//获取门店信息
$biz = $this->biz_model->get(['id'=>$row['biz_id']]);
$row['company'] = $this->sys_company_model->get(["title like '%服务%'"=>null,'status'=>1]);
- $is_insure = false;
if($row['srv_ids']){
$service_rows = $this->services_model->select(["id in ({$row['srv_ids']})"=>null],'','','','title');
$services = implode(',',array_column($service_rows,'title'));
- $srv_id_arr = explode(',',$row['srv_ids']);
- $is_insure = in_array(1,$srv_id_arr) ? true : false;
}
if($opt_row['srv_ids']){
$service_rows = $this->services_model->select(["id in ({$opt_row['srv_ids']})"=>null],'','','','title');
@@ -339,12 +346,10 @@ class Protocol extends CI_Controller{
}
$this->load->library('receiver/orders_entity');
$srv_price = $this->orders_entity->order_srv_money($row['id']);
- $total_price = $srv_price;
- $is_insure && $total_price = $total_price + $money_json['price_insure'];
}
$row['services'] = $services;
$row['old_services'] = $old_services;
- $row['total_price'] = $total_price;
+ $row['srv_price'] = $srv_price;
$row['info_json'] = json_decode($row['info_json'],true);
$row['day'] = $contract ? date('Y年m月d日',$contract['c_time']):date('Y年m月d日');
$row['cid'] = $contract['cid'];
diff --git a/api/views/wxapp/licheb/html2pdf/agent.php b/api/views/wxapp/licheb/html2pdf/agent.php
index 74e34c46..12c3ce25 100644
--- a/api/views/wxapp/licheb/html2pdf/agent.php
+++ b/api/views/wxapp/licheb/html2pdf/agent.php
@@ -46,9 +46,9 @@
乙方为节省时间和精力，就甲乙双方《车辆买卖合同》标的的车辆，自愿委托甲方办理下列委托事项，并达成如下协议：
一、委托代办服务事项（乙方授权甲方代办下列事项）
-
+ 元
- 代办服务总价：元， ，保险费用由乙方直接支付给保险公司。
+ 代办服务总价：元，
二、双方特别约定
1、车牌选号若为代选号牌时，均由甲方电话通知乙方，因乙方未能及时选号等其它原因，甲方有权代理决定并不对最终选号结果负责；若为自选号牌，甲方可配合乙方上牌，但不对最终选号结果负责。
2、乙方委托甲方代办车辆挂牌服务时，乙方应事先办妥机动车车辆保险，投保险种包括但不限于车辆损失险和第三者责任险。甲方在代办服务过程中造成车辆毁损、灭失的，乙方应当先向保险公司索赔，赔付不足部分由甲方予以修复或赔偿。
diff --git a/api/views/wxapp/licheb/html2pdf/agent_sp.php b/api/views/wxapp/licheb/html2pdf/agent_sp.php
index e67f6527..5a3614b3 100644
--- a/api/views/wxapp/licheb/html2pdf/agent_sp.php
+++ b/api/views/wxapp/licheb/html2pdf/agent_sp.php
@@ -24,7 +24,7 @@
甲、乙双方经友好协商，依据实际情况，在原协议基础上变更协议条款部分内容，特订立以下补充协议。
第一条 车辆基本情况
代办项目由 变更为
- 代办服务总价：元， ，保险费用由乙方直接支付给保险公司。
+ 代办服务总价：元， ，保险费用由乙方直接支付给保险公司。
二、本协议生效后,即成为原合同不可分割的组成部分,与原合同具有同等的法律效力。
除本协议中明确所作修改的条款之外，原合同的其余部分应完全继续有效。
本协议与原合同有相互冲突时,以本协议为准。
diff --git a/api/views/wxapp/licheb/html2pdf/car_fh.php b/api/views/wxapp/licheb/html2pdf/car_fh.php
index 352fb148..ad282f7a 100644
--- a/api/views/wxapp/licheb/html2pdf/car_fh.php
+++ b/api/views/wxapp/licheb/html2pdf/car_fh.php
@@ -56,7 +56,7 @@
二、结算信息
- 应付款合计 ，其中包含：车辆价款 ,委托代办款项
+ 应付款合计 ，其中包含：车辆价款 ,委托代办款项
已付款合计
三、证件资料交接信息
diff --git a/api/views/wxapp/licheb/protocol/agent.php b/api/views/wxapp/licheb/protocol/agent.php
index 9ef87cab..e22d6c7d 100644
--- a/api/views/wxapp/licheb/protocol/agent.php
+++ b/api/views/wxapp/licheb/protocol/agent.php
@@ -27,9 +27,9 @@
乙方为节省时间和精力，就甲乙双方《车辆买卖合同》标的的车辆，自愿委托甲方办理下列委托事项，并达成如下协议：
一、委托代办服务事项（乙方授权甲方代办下列事项）
-
+
元
-
代办服务总价：元，，保险费用由乙方直接支付给保险公司。
+
代办服务总价：元，
二、双方特别约定
1、车牌选号若为代选号牌时，均由甲方电话通知乙方，因乙方未能及时选号等其它原因，甲方有权代理决定并不对最终选号结果负责；若为自选号牌，甲方可配合乙方上牌，但不对最终选号结果负责。
2、乙方委托甲方代办车辆挂牌服务时，乙方应事先办妥机动车车辆保险，投保险种包括但不限于车辆损失险和第三者责任险。甲方在代办服务过程中造成车辆毁损、灭失的，乙方应当先向保险公司索赔，赔付不足部分由甲方予以修复或赔偿。
diff --git a/api/views/wxapp/licheb/protocol/agent_sp.php b/api/views/wxapp/licheb/protocol/agent_sp.php
index afa96065..bf053141 100644
--- a/api/views/wxapp/licheb/protocol/agent_sp.php
+++ b/api/views/wxapp/licheb/protocol/agent_sp.php
@@ -27,7 +27,7 @@
甲、乙双方经友好协商，依据实际情况，在原协议基础上变更协议条款部分内容，特订立以下补充协议。
第一条 车辆基本情况
代办项目由 变更为
-
代办服务总价：元， ，保险费用由乙方直接支付给保险公司。
+
代办服务总价：元， ，保险费用由乙方直接支付给保险公司。
二、本协议生效后,即成为原合同不可分割的组成部分,与原合同具有同等的法律效力。
除本协议中明确所作修改的条款之外，原合同的其余部分应完全继续有效。
本协议与原合同有相互冲突时,以本协议为准。
diff --git a/api/views/wxapp/licheb/protocol/car_fh.php b/api/views/wxapp/licheb/protocol/car_fh.php
index 1a1da4e9..5bd4e1d6 100644
--- a/api/views/wxapp/licheb/protocol/car_fh.php
+++ b/api/views/wxapp/licheb/protocol/car_fh.php
@@ -60,7 +60,7 @@
二、结算信息
- 应付款合计 ，其中包含：车辆价款 ，委托代办款项
+ 应付款合计 ，其中包含：车辆价款 ，委托代办款项
已付款合计
三、证件资料交接信息