编号【{$row['sid']}】
@@ -107,6 +114,7 @@ require_once APPPATH.'controllers/wxapp/Wxapp.php';
其中，
1.定金（元）：{$fill_info['price_book']}
2.整车尾款（元）：{$fill_info['last_price']}
+ {$sa_div}
";
$list[] = [
'title' => '购车协议',
diff --git a/api/controllers/wxapp/licheb/CusorderV2.php b/api/controllers/wxapp/licheb/CusorderV2.php
index 8c6c82b7..13315728 100644
--- a/api/controllers/wxapp/licheb/CusorderV2.php
+++ b/api/controllers/wxapp/licheb/CusorderV2.php
@@ -87,6 +87,7 @@ class CusorderV2 extends Wxapp{
$business_id = $this->input_param('business_id'); //商务政策id
$car_city_id = $this->input_param('c_city_id');//上牌城市
$pro = $this->input_param('pro'); //省市数组
+ $sa = $this->input_param('sa'); //补充协商
$row = $this->customers_model->get(['id'=>$cus_id]);
$series_row = $this->auto_series_model->get(['id'=>$car_id]);
@@ -212,7 +213,7 @@ class CusorderV2 extends Wxapp{
}
$o_id = $this->orders_model->add($data);
- if($o_id){
+ if(is_numeric($o_id)){
$userinfo = $this->app_liche_users_model->get(['mobile'=>$data['mobile']],'id');
$this->orders_v2_entity->add_book_order($o_id,$userinfo['id']);
if($payway){ //全款服务费和尾款订单
@@ -221,7 +222,8 @@ class CusorderV2 extends Wxapp{
//更新客户下单时间
$this->customers_model->update(array('order_time' => date('Y-m-d H:i:s')),['id'=>$cus_id]);
$this->customers_entity->add_log($cus_id, $this->session['uid'], $this->session['uname'], '生成订单', 6);
-
+ //补充协商
+ $sa && $this->order_datas_entity->up_data($o_id,['sa'=>$sa]);
return ['id'=>$o_id,'pay_img'=>$orders_entity->pay_img($o_id)];
}else{
throw new Exception('创建失败', ERR_PARAMS_ERROR);
@@ -326,6 +328,7 @@ class CusorderV2 extends Wxapp{
$srv_arr = $this->input_param('srv_arr');
$fines = $this->input_param('fines');
$business_id = $this->input_param('business_id'); //商务政策id
+ $sa = $this->input_param('sa'); //补充协商
$row = $this->orders_model->get(['id'=>$id]);
$series_row = $this->auto_series_model->get(['id'=>$car_id]);
@@ -426,6 +429,8 @@ class CusorderV2 extends Wxapp{
$result = $this->orders_model->update($data,['id'=>$row['id']]);
if($result){
$this->orders_v2_entity->edit_order($data,$row);
+ //补充协商
+ $sa && $this->order_datas_entity->up_data($row['id'],['sa'=>$sa]);
throw new Exception('修改成功', API_CODE_SUCCESS);
}else{
throw new Exception('修改失败', ERR_PARAMS_ERROR);
@@ -582,6 +587,9 @@ class CusorderV2 extends Wxapp{
$admin_row = $this->app_user_model->get(['id'=>$row['sale_id']],'uname');
$data['admin_name'] = $admin_row['uname'];
}
+ //获取补充协议
+ $order_data = $this->receiver_order_datas_model->get(['o_id'=>$row['id']],'sa');
+ $data['sa'] = $order_data['sa'] ? $order_data['sa'] : '';
return $data;
}
diff --git a/common/libraries/receiver/Order_datas_entity.php b/common/libraries/receiver/Order_datas_entity.php
index d0006b65..b4b73146 100644
--- a/common/libraries/receiver/Order_datas_entity.php
+++ b/common/libraries/receiver/Order_datas_entity.php
@@ -106,4 +106,21 @@ class Order_datas_entity{
return $result;
}
+ /**
+ * 更新数据
+ * @param $oid
+ * @param $data
+ * @return void
+ */
+ public function up_data($oid,$data){
+ if(!$data){
+ return false;
+ }
+ $row = $this->ci->receiver_order_datas_model->get(['o_id'=>$oid]);
+ if(!$row){
+ $this->ci->receiver_order_datas_model->add(['o_id'=>$oid,'c_time'=>time()]);
+ }
+ $res = $this->ci->receiver_order_datas_model->update($data,['o_id'=>$oid]);
+ return $res;
+ }
}
diff --git a/common/libraries/receiver/Orders_v2_entity.php b/common/libraries/receiver/Orders_v2_entity.php
index ad98124d..53d7d5b9 100644
--- a/common/libraries/receiver/Orders_v2_entity.php
+++ b/common/libraries/receiver/Orders_v2_entity.php
@@ -493,6 +493,10 @@ class Orders_v2_entity{
'last_price' => $fill_info['last_price'],
];
$pdf_path = 'pdf/car_tpl.pdf';
+ if($fill_info['sa']){
+ $fill_data['sa'] = $fill_info['sa'];
+ $pdf_path = 'pdf/car_sa_tpl.pdf';
+ }
$save_path = "pdf/{$this->order_row['sid']}/car.pdf";
$this->ci->load->library('pdftk');
$req = $this->ci->pdftk->esign_fill_pdf($pdf_path,$save_path,$fill_data);
@@ -556,6 +560,7 @@ class Orders_v2_entity{
$business_id = $info_json['business_id'] ? $info_json['business_id'] : 0;
$data = [];
+ $biz = $this->ci->biz_model->get(['id'=>$row['biz_id']]);
//车辆信息
$money_json = json_decode($row['money_json'],true);
$money_json['price_discount'] && $row['price'] = $row['price'] - $money_json['price_discount'];
@@ -607,6 +612,12 @@ class Orders_v2_entity{
$data['vin'] = $items['vin'];
$data['delivery'] = $delivery;
}
+ $data['sa'] = '';
+ if($biz['type']==1){
+ $this->ci->load->model('receiver/order/receiver_order_datas_model');
+ $order_data = $this->ci->receiver_order_datas_model->get(['o_id'=>$row['id']]);
+ $order_data['sa'] && $data['sa'] = $order_data['sa'];
+ }
if(!$type){
$services = [];
$srv_arr = json_decode($row['srv_ids'],true);
diff --git a/www/api/pdf/car_sa_tpl.pdf b/www/api/pdf/car_sa_tpl.pdf
new file mode 100755
index 0000000000000000000000000000000000000000..15b13aa80766014efc296105574e0fabd9c1b1ce
GIT binary patch
literal 416853
zcma&N1yCg2vMr1b4DPOjYeVBcI1DzpySqDs%i!+r?(Xi=xV!7%&cNe4=iGPiA8}vA
zUlkQmyS8NJ+PQXQW=B)}6cJ-!W@JaC*xduoA;K}UFp)5k*cw