From 5c341c997d29d72f582258e5b9db842ea39746fd Mon Sep 17 00:00:00 2001
From: qianhy <git110@qhy>
Date: Sun, 29 Jan 2023 10:45:21 +0800
Subject: [PATCH] orderv2 modify edit_status

---
 admin/controllers/receiver/orderv2/Orders.php | 15 +++++++++++++--
 admin/views/receiver/orderv2/edit_status.php  |  7 +++++++
 admin/views/receiver/orderv2/lists.php        |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php
index b5737cb9..05921a4b 100644
--- a/admin/controllers/receiver/orderv2/Orders.php
+++ b/admin/controllers/receiver/orderv2/Orders.php
@@ -1321,11 +1321,22 @@ class Orders extends HD_Controller
     public function edit_status(){
         if($this->input->method()=='post'){
             $id = $this->input->post('id');
-            $row = $this->receiver_orders_v2_model->get(['id'=>$id]);
+            $sid = $this->input->post('sid');
+            if (!$id && !$sid){
+                return $this->show_json(SYS_CODE_FAIL, '订单id 与 订单号，必须填写一个');
+            }
+            $row = array();
+            if ($id && $sid){
+                $row = $this->receiver_orders_v2_model->get(['id'=>$id, 'sid'=>$sid]);
+            }
+            else{
+                $id && $row = $this->receiver_orders_v2_model->get(['id'=>$id]);
+                $sid && $row = $this->receiver_orders_v2_model->get(['sid'=>$sid]);
+            }
             if(!$row){
                 return $this->show_json(SYS_CODE_FAIL, '订单不存在');
             }
-            $res = $this->receiver_orders_v2_model->update(['status'=>2,'refund_time'=>date('Y-m-d H:i:s')],['id'=>$id]);
+            $res = $this->receiver_orders_v2_model->update(['status'=>2,'refund_time'=>date('Y-m-d H:i:s')],['id'=>$row['id']]);
             if($res){
                 $this->app_liche_orders_model->update(['status'=>-1],['o_id'=>$row['id'],'pid'=>0]);
                 return $this->show_json(SYS_CODE_SUCCESS, '修改成功');
diff --git a/admin/views/receiver/orderv2/edit_status.php b/admin/views/receiver/orderv2/edit_status.php
index 3a954e0a..79e8cde8 100644
--- a/admin/views/receiver/orderv2/edit_status.php
+++ b/admin/views/receiver/orderv2/edit_status.php
@@ -6,6 +6,13 @@
             <input type="text" value="" name="id"/>
         </div>
     </div>
+    <div class="am-form-group">
+        <label class="am-para-label">订单号：</label>
+        <div class="am-para-input">
+            <input type="text" value="" name="sid"/>
+            * 订单id 与 订单号，只要有一个条件就可
+        </div>
+    </div>
 
     <div class="am-form-group" style="margin-bottom: 2rem">
         <div class="am-para-input">
diff --git a/admin/views/receiver/orderv2/lists.php b/admin/views/receiver/orderv2/lists.php
index acf5ce75..5b475d45 100644
--- a/admin/views/receiver/orderv2/lists.php
+++ b/admin/views/receiver/orderv2/lists.php
@@ -262,7 +262,7 @@
                     </button>
                 </div>
                 <div class="am-form-group fl ml10">
-                    <a type="button" data-modal="/receiver/orderv2/orders/edit_status" class="am-btn am-btn-success am-btn-sm w100">退款
+                    <a type="button" data-modal="/receiver/orderv2/orders/edit_status" class="am-btn am-btn-success am-btn-sm w100" data-title="退款">退款
                     </a>
                 </div>
                 <!--