wupengfei 1 年之前
父節點
當前提交
e81214c33f

+ 3 - 2
.idea/workspace.xml

@@ -3,7 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/order/view/store_order/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/order/view/store_order/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/order/controller/RefundOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/order/controller/RefundOrder.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/order/view/refund_order/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/order/view/refund_order/index_search.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -420,7 +421,7 @@
       <workItem from="1694392543142" duration="23428000" />
       <workItem from="1694480523673" duration="21063000" />
       <workItem from="1694565971470" duration="21552000" />
-      <workItem from="1694652561038" duration="14026000" />
+      <workItem from="1694652561038" duration="14147000" />
     </task>
     <servers />
   </component>

+ 1 - 0
application/order/controller/RefundOrder.php

@@ -38,6 +38,7 @@ class RefundOrder extends Controller
         $where[] = ['r.order_type','=',2];
         $where[] = ['r.status','<>',5];
         if($this->request->request('tel'))$where[]= ['u.phone','like','%'.$this->request->request('tel').'%'];
+        if($this->request->request('order_no'))$where[]= ['o.order_no','like','%'.$this->request->request('order_no').'%'];
         if($this->request->request('user_name'))$where[]= ['u.name','like','%'.$this->request->request('user_name').'%'];
         $query->alias('r')
             ->field('r.express_time,r.consignee_add,r.consignee_name,r.consignee_tel,r.express_company,r.express_no,r.id as rid,refund_type,r.create_at as rtime,r.status as rstatus,r.express_info,r.order_id,r.refund_money, u.name ,u.phone as user_phone,u.headimg, o.*')

+ 6 - 0
application/order/view/refund_order/index_search.html

@@ -8,6 +8,12 @@
             </div>
         </div>
         <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">订单号</label>
+            <div class="layui-input-inline">
+                <input name="order_no" value="{$Think.get.order_no|default=''}" placeholder="请输入订单号" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline">
             <label class="layui-form-label">用户名称</label>
             <div class="layui-input-inline">
                 <input name="user_name" value="{$Think.get.user_name|default=''}" placeholder="请输入用户名称" class="layui-input">