From 03c904e34fd01004d96a2b90ccabd21a6b978376 Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Mon, 23 May 2022 10:48:58 +0800
Subject: [PATCH] add-admin-order_status

---
 admin/controllers/auto/Business.php                       | 1 +
 admin/libraries/Ordersv2List.php                          | 8 ++++++--
 admin/views/auto/business/lists.php                       | 4 +++-
 .../models/receiver/order/Receiver_order_status_model.php | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/admin/controllers/auto/Business.php b/admin/controllers/auto/Business.php
index dff825c6..b72eae86 100644
--- a/admin/controllers/auto/Business.php
+++ b/admin/controllers/auto/Business.php
@@ -124,6 +124,7 @@ class Business extends HD_Controller{
                         's_effect_time' => $v['s_effect_time'] ? date('Y-m-d',$v['s_effect_time']) : '',
                         'effect_status' => $v['if_effect'] ? '生效中' : '未生效',
                         'if_effect' => $v['if_effect'],
+                        'delivery_day' => $v['delivery_day']
                     );
                 }
             }
diff --git a/admin/libraries/Ordersv2List.php b/admin/libraries/Ordersv2List.php
index 2e9b1362..1e8d58b7 100644
--- a/admin/libraries/Ordersv2List.php
+++ b/admin/libraries/Ordersv2List.php
@@ -229,7 +229,7 @@ class Ordersv2List
         } else {
             $orderby = "{$this->t1}.c_time desc";
         }
-        if (strlen($params['status_pid']) && $params['status'] && $params['status_pid']!=21) {
+        if (strlen($params['status_pid']) && $params['status'] && $params['status_pid']!=21 &&$params['status']<21) {
             $where["{$this->t2}.pid_status"] = $params['status_pid'];
             $up_key = $params['status'] + 1;
             $where["{$this->t2}.status in ({$params['status']},{$up_key})"] = null;
@@ -240,7 +240,7 @@ class Ordersv2List
             $count = $this->ci->mdOrders->selectOrders($where, '', '', '', 1, '', $having);
             $rows = $this->ci->mdOrders->selectOrders($where, $orderby, $page, $size, '', $fileds, $having);
         } else {
-            if (strlen($params['status'])) {
+            if (strlen($params['status']) && $params['status']<21) {
                 $where["id not in (select o_id from lc_receiver_order_status where pid_status={$params['status_pid']} and status=1)"] = null;
             }
             if ($params['status_pid'] == 3) { //开票
@@ -251,6 +251,10 @@ class Ordersv2List
                 }
             }
             $params['status_pid'] == 21 && $where['status'] = 2; //退款
+            if($params['status']==21){ //特殊需求
+                $where["id in (select o_id from lc_receiver_order_status where pid_status=0 and status=1)"] = null; //已付定金
+                $where["id not in (select o_id from lc_receiver_order_status where pid_status=0 and status=2)"] = null; //尾款未支付
+            }
             $count = $this->ci->mdOrders->count($where);
             $rows = $this->ci->mdOrders->select($where, $orderby, $page, $size, $fileds);
         }
diff --git a/admin/views/auto/business/lists.php b/admin/views/auto/business/lists.php
index a54bc9db..323c0e40 100644
--- a/admin/views/auto/business/lists.php
+++ b/admin/views/auto/business/lists.php
@@ -96,6 +96,7 @@
                 <th width="10%"><span>颜色加价</span></th>
                 -->
                 <th width="7%"><span>城市</span></th>
+                <th width="7%"><span>交车时长</span></th>
                 <th width="7%"><span>时间</span></th>
                 <th width="10%"><span>生效时间</span></th>
                 <th width="7%"><span>是否生效</span></th>
@@ -105,7 +106,7 @@
             <tbody>
                 <template v-for="(v,i) in lists">
                     <tr class="tl">
-                        <td colspan="12">车型：<span style="font-weight: 600;color:#FF7F50;">{{v.title}}</span></td>
+                        <td colspan="13">车型：<span style="font-weight: 600;color:#FF7F50;">{{v.title}}</span></td>
                     </tr>
                     <tr >
                         <td>
@@ -123,6 +124,7 @@
                         <td>{{v.price_color}}</td>
                         -->
                         <td>{{v.city_cn}}</td>
+                        <td>{{v.delivery_day}}</td>
                         <td>{{v.month}}</td>
                         <td>{{v.s_effect_time}}</td>
                         <td>{{v.effect_status}}</td>
diff --git a/common/models/receiver/order/Receiver_order_status_model.php b/common/models/receiver/order/Receiver_order_status_model.php
index 8b8302df..901d9842 100644
--- a/common/models/receiver/order/Receiver_order_status_model.php
+++ b/common/models/receiver/order/Receiver_order_status_model.php
@@ -38,7 +38,7 @@ class Receiver_order_status_model extends HD_Model
     {
         $status_ary[12] = array('name' => '意向金', 'show' => true, 'list' => array(), 'menu_list' => array(),'pid_status'=>'');
 
-        $status_ary[0] = array('name' => '付款', 'show' => true, 'list' => array(0 => '未付款', 1 => '已下定', 2 => '已付款'),
+        $status_ary[0] = array('name' => '付款', 'show' => true, 'list' => array(0 => '未付款', 1 => '已下定',21=>'未付尾款', 2 => '已付款'),
             'menu_list' => array(0 => '未付款', 1 => '已付款'), 'menu_default' => 0,'pid_status'=>0);
         $status_ary[1] = array('name' => '分期办理', 'show' => true, 'list' => array(0 => '分期办理中', 1 => '等待放款' , 2 => '完成按揭'),
             'menu_list' => array(0 => '分期办理中', 1 => '等待放款' , 2 => '完成按揭'), 'menu_default' => 0,'pid_status'=>1);