From 46cd20719701a5c4a6d02b95cb96955df335f980 Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Thu, 12 May 2022 16:33:36 +0800
Subject: [PATCH] edit-admin-order_list

---
 admin/libraries/Ordersv2List.php                       | 10 ++++++----
 common/libraries/receiver/Orders_v2_entity.php         | 10 ++++++----
 .../receiver/order/Receiver_order_status_model.php     |  1 +
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/admin/libraries/Ordersv2List.php b/admin/libraries/Ordersv2List.php
index 7614f66a..a827a397 100644
--- a/admin/libraries/Ordersv2List.php
+++ b/admin/libraries/Ordersv2List.php
@@ -229,7 +229,8 @@ class Ordersv2List
         } else {
             $orderby = "{$this->t1}.c_time desc";
         }
-        if (strlen($params['status_pid']) && $params['status']) {
+//        print_r($params);exit;
+        if (strlen($params['status_pid']) && $params['status'] && $params['status_pid']!=21) {
             $where["{$this->t2}.pid_status"] = $params['status_pid'];
             $up_key = $params['status'] + 1;
             $where["{$this->t2}.status in ({$params['status']},{$up_key})"] = null;
@@ -250,6 +251,7 @@ class Ordersv2List
                     $where['id in (select o_id from lc_receiver_order_status where (pid_status=0 and status=2) or (pid_status=3 and status=1))'] = null;
                 }
             }
+            $params['status_pid'] == 21 && $where['status'] = 2; //退款
             $count = $this->ci->mdOrders->count($where);
             $rows = $this->ci->mdOrders->select($where, $orderby, $page, $size, $fileds);
         }
@@ -500,7 +502,7 @@ class Ordersv2List
         if (!strlen($status_pid)) {
             $fields2 = [
                 'car_name' => ['title' => '车辆', 'width' => '27%'], 'biz_name' => ['title' => '门店', 'width' => '12%'],
-                'price' => ['title' => '车辆平台价', 'width' => '9%'],
+                'price' => ['title' => '最终售价', 'width' => '9%'],
 //                'payway_name' => ['title' => '付款方式', 'width' => '8%'],
                 'of_title' => ['title' => '客户来源', 'width' => '10%'], 'status_name' => ['title' => '状态', 'width' => '9%'],
                 'c_time' => ['title' => '订单时间', 'width' => '9%'
@@ -509,7 +511,7 @@ class Ordersv2List
         } elseif ($status_pid == 3) {
             $fields2 = [
                 'car_name' => ['title' => '车辆', 'width' => '27%'], 'biz_name' => ['title' => '门店', 'width' => '12%'],
-                'price' => ['title' => '车辆平台价', 'width' => '9%'],
+                'price' => ['title' => '最终售价', 'width' => '9%'],
 //                'payway_name' => ['title' => '付款方式', 'width' => '8%'],
                 'of_title' => ['title' => '客户来源', 'width' => '10%'], 'status_name' => ['title' => '状态', 'width' => '9%'],
                 'bill_time' => ['title' => '开票时间', 'width' => '9%']
@@ -517,7 +519,7 @@ class Ordersv2List
         } else {
             $fields2 = [
                 'car_name' => ['title' => '车辆', 'width' => '27%'], 'biz_name' => ['title' => '门店', 'width' => '12%'],
-                'price' => ['title' => '车辆平台价', 'width' => '9%'],
+                'price' => ['title' => '最终售价', 'width' => '9%'],
 //                'payway_name' => ['title' => '付款方式', 'width' => '8%'],
                 'of_title' => ['title' => '客户来源', 'width' => '10%'], 'status_name' => ['title' => '状态', 'width' => '9%'],
                 'over_time' => ['title' => '交付截止', 'width' => '9%'],'order_time' => ['title' => '下定时间', 'width' => '9%']
diff --git a/common/libraries/receiver/Orders_v2_entity.php b/common/libraries/receiver/Orders_v2_entity.php
index dc5680f6..8a77fef0 100644
--- a/common/libraries/receiver/Orders_v2_entity.php
+++ b/common/libraries/receiver/Orders_v2_entity.php
@@ -493,7 +493,7 @@ class Orders_v2_entity{
             $this->ci->orders_entity->add_log($row['id'],$user_info['uid'],$user_info['uname'],$content);
             //短信通知
             $params = [
-                'sid' => $row['s_id'],
+                'sid' => $row['sid'],
                 'car_a' => $old_title,
                 'car_b' => $new_title,
             ];
@@ -735,8 +735,10 @@ class Orders_v2_entity{
         if(!template || !$params){
             return '';
         }
-        $mobile = '18950000118';
-        !is_product() && $mobile = '18350451617'; //测试
-        send_alisms(array('mobile' => $mobile, 'template' => $template, 'param' => $params));
+        $mobile_lists = ['18950000118','13860199646'];
+        !is_product() && $mobile_lists = ['18350451617']; //测试
+        foreach ($mobile_lists as $val){
+            send_alisms(array('mobile' => $val, 'template' => $template, 'param' => $params));
+        }
     }
 }
diff --git a/common/models/receiver/order/Receiver_order_status_model.php b/common/models/receiver/order/Receiver_order_status_model.php
index 202893d7..8b8302df 100644
--- a/common/models/receiver/order/Receiver_order_status_model.php
+++ b/common/models/receiver/order/Receiver_order_status_model.php
@@ -49,6 +49,7 @@ class Receiver_order_status_model extends HD_Model
         $status_ary[4] = array('name' => '交付车辆', 'show' => true, 'list' => array(0 => '待销售确认', 1 => '销售已确认', 2 => '用户已确认'),
             'menu_list' => array(0 => '待销售确认', 1 => '销售已确认', 2 => '用户已确认'), 'menu_default' => 0,'pid_status'=>4);
         $status_ary[5] = array('name' => '交易完成', 'show' => true, 'list' => array(), 'menu_list' => array(),'pid_status'=>5);
+        $status_ary[21] = array('name' => '退款', 'show' => true, 'list' => array(), 'menu_list' => array(),'pid_status'=>0);
 //        $status_ary[6] = array('name' => '资料审核', 'show' => true, 'list' => array(0 => '资料未上传', 1 => '国补审核中', 2 => '已审核'),
 //            'menu_list' => array(0 => '资料未上传', 1 => '国补审核中', 2 => '已审核'), 'menu_default' => 0);
         if (strlen($status)) {