edit-api-pay_after

admin/libraries/Ordersv2List.php

@@ -323,6 +323,7 @@ class Ordersv2List
                     $fields['name'] = $size > 1000 ? $val['name']
                         : '<a href="javascript:;" data-open="' . $open_url . $val['id'] . '">' . $val['name'] . $o_tp . '<br>' . $val['mobile'] . '</a>';
                 }
+                $fields['id_card'] = $info_json['c_owner_cardid'];
                 $fields['mobile'] = $mobile;
                 $fields['car_name'] = "{$brand_name}-{$series_name}-{$v_name}-{$cor_name}";
                 $fields['price_car'] = number_format($money_json['price_car'],2);
@@ -557,6 +558,7 @@ class Ordersv2List
             $fields['over_time'] = ['title' => '止交付时间'];
             $fields['order_time'] = ['title' => '下定时间'];
             $fields['bill_time'] = ['title' => '开票时间'];
+            $fields['id_card'] = ['title' => '身份证'];
         }
         return $fields;
     }

api/controllers/wxapp/liche/Order.php

@@ -30,6 +30,7 @@ class Order extends Wxapp{
         $this->load->model('auto/auto_series_model');
         $this->load->model('auto/auto_brand_model');
         $this->load->model('auto/auto_attr_model');
+        $this->load->model("biz/biz_model");
 
         $this->load->model('app/liche/app_liche_orders_model');
         $this->load->library('receiver/orders_v2_entity');
@@ -221,7 +222,10 @@ class Order extends Wxapp{
                     }
                 }
                 $show_agree = true;
-                $order['brand_id'] == 4 && $show_agree = false;
+                if($order['brand_id'] == 4) { //除宁德哪吒需要购车合同
+                    $biz = $this->biz_model->get(['id'=>$order['biz_id']],'city_id');
+                    $show_agree = $biz['city_id'] == '350900'||$order['srv_ids'] ? true : false;
+                }
                 $ckcar_status = false;
                 $agent_ck = $this->receiver_order_status_model->count(['o_id'=>$val['o_id'],'status'=>1,'pid_status'=>4]);
                 $user_ck = $this->receiver_order_status_model->count(['o_id'=>$val['o_id'],'status'=>2,'pid_status'=>4]);

api/controllers/wxapp/liche/Protocol.php

@@ -70,7 +70,14 @@ require_once  APPPATH.'controllers/wxapp/Wxapp.php';
     <div>经充分协商，双方约定:</div>
     <div>{$fill_info['sa']}</div>";
         }
-        $car_html = "<div style=\"margin-top:20px;text-align:center;font-weight:bold;font-size:4.266vw;\"><b>汽车购买协议</b></div>
+        $show_car_pro = true;
+        if($this->order_row['brand_id'] == 4) { //除宁德哪吒需要购车合同
+            $this->load->model("biz/biz_model");
+            $biz = $this->biz_model->get(['id'=>$this->$row['biz_id']],'city_id');
+            $show_car_pro = $biz['city_id'] == '350900' ? true : false;
+        }
+        if($show_car_pro) {
+            $car_html = "<div style=\"margin-top:20px;text-align:center;font-weight:bold;font-size:4.266vw;\"><b>汽车购买协议</b></div>
   <div style=\"background-color:#f8f8f8;border:#ebebeb 1px solid;box-sizing:border-box;margin-top:4vw;padding:4vw;border-radius:1.333vw;line-height:2;word-break:break-all;word-wrap:break-word;font-size:3.2vw;color:#666;overflow-x:hidden;\">
     <div style=\"text-align:right;\">编号【{$row['sid']}】</div>
     <div style=\"text-indent:6.4vw;\">本《汽车购买协议》(“本协议”)，由您(“狸车用户”)与下述签署本协议的狸车销售公司或其关联公司 (以下统称“狸车公司”)，于本协议附件一所载明的协议签署日签署。</div>
@@ -117,11 +124,12 @@ require_once  APPPATH.'controllers/wxapp/Wxapp.php';
     <div>2.整车尾款（元）：{$fill_info['last_price']}</div>
     {$sa_div}
   </div>";
-        $list[] = [
-            'title' => '购车协议',
-            'url' => '',
-            'content' => $car_html
-        ];
+            $list[] = [
+                'title' => '购车协议',
+                'url' => '',
+                'content' => $car_html
+            ];
+        }
         if($row['srv_ids']){
             $service_str = implode('<br>',$fill_info['services']);
             $agent_html = " <div style=\"margin-top:20px;text-align:center;font-weight:bold;font-size:4.266vw;\"><b>委托服务协议</b></div>

api/controllers/wxapp/licheb/CusorderV2.php

@@ -947,12 +947,12 @@ class CusorderV2 extends Wxapp{
             if($is_pay){ //存在已支付订单并且修改信息 写日志
                 $content = [];
                 if($owner_name!=$row['owner_name']){
-                    $content[] = "车姓名由 {$row['owner_name']} 变更为 {$owner_name}";
+                    $content[] = "车主姓名由 {$row['owner_name']} 变更为 {$owner_name}";
                     $owner_a = $row['owner_name'];
                     $owner_b = $owner_name;
                 }
                 if($owner_mobile!=$row['owner_mobile']){
-                    $content[] = "车手机号由 {$row['owner_mobile']} 变更为 {$owner_mobile}";
+                    $content[] = "车主手机号由 {$row['owner_mobile']} 变更为 {$owner_mobile}";
                     $owner_a = $row['owner_mobile'];
                     $owner_b = $owner_mobile;
                 }