From 41b9e2ad4f78bc46521c4ea51f34f6ae4b94ac5a Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Mon, 20 Jun 2022 09:34:06 +0800
Subject: [PATCH] edit-admin-add_price

---
 admin/controllers/receiver/orderv2/Orders.php  | 2 +-
 common/libraries/receiver/Orders_v2_entity.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php
index 17fd1545..2037facd 100644
--- a/admin/controllers/receiver/orderv2/Orders.php
+++ b/admin/controllers/receiver/orderv2/Orders.php
@@ -837,8 +837,8 @@ class Orders extends HD_Controller
 
         $companys = $this->sys_company_model->select(['status' => 1, 'wx_mchid!=' => ''], 'id desc', '', '', 'id,wx_mchid,short');
         $type = [];
-        $srv_price >0 && $type[] = ['id'=>2,'name'=>'服务费'];
         $type[] = ['id'=>6,'name'=>'车款'];
+        $srv_price >0 && $type[] = ['id'=>2,'name'=>'服务费'];
         $this->data['type'] = $type;
         $this->data['companys'] = $companys;
         $this->data['id'] = $this->input->get('id');
diff --git a/common/libraries/receiver/Orders_v2_entity.php b/common/libraries/receiver/Orders_v2_entity.php
index 0a9205d0..9cddd241 100644
--- a/common/libraries/receiver/Orders_v2_entity.php
+++ b/common/libraries/receiver/Orders_v2_entity.php
@@ -534,6 +534,7 @@ class Orders_v2_entity{
             $need_sign = $biz['city_id'] == '350900' ? true : false;
         }
         $fill_info = $this->pdf_data($this->order_row);
+        $this->ci->load->library('pdftk');
         if($need_sign) {
             $fill_data = [
                 'sid' => $this->order_row['sid'],
@@ -562,7 +563,6 @@ class Orders_v2_entity{
                 $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);
             if (!$req['code']) {
                 return ['code' => 0, 'msg' => $req['msg']];