diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
index c96af64..984841c 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
@@ -1,8 +1,6 @@
 package cn.chjyj.szwh.controller.admin;
 
-import cn.chjyj.szwh.bean.Order;
 import cn.chjyj.szwh.bean.OrderGoodsDetail;
-import cn.chjyj.szwh.constant.ChConstant;
 import cn.chjyj.szwh.controller.BaseController;
 import cn.chjyj.szwh.service.OrderGoodsDetailService;
 import cn.chjyj.szwh.service.OrderService;
@@ -12,7 +10,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -23,7 +20,7 @@ import java.util.Map;
  * just support post method
  */
 @RestController
-@RequestMapping(value = "/admin/order.Order",method = RequestMethod.POST)
+@RequestMapping(value = "/admin/order.Order")
 public class AdminOrderController extends BaseController {
     @Autowired
     private OrderService orderService;
@@ -35,20 +32,57 @@ public class AdminOrderController extends BaseController {
      * @return
      */
     @PostMapping("/list")
-    public JSONObject odlist(@RequestBody String jsonStr){
-        JSONObject request = JSONObject.parseObject(jsonStr);
-        Map odmap = orderMap(request);
-        if(odmap.size()==0){
-            odmap.put("1",1);
+    public JSONObject odlist(@RequestBody(required = false) String jsonStr){
+        JSONObject request = JSON.parseObject(jsonStr);
+        Map rqmap = new HashMap();
+        if(StringUtils.isBlank(jsonStr)){
+            rqmap=null;
+        }
+        // 订单编号
+        String batchcode= request.getString("batchcode");
+        if(StringUtils.isNotBlank(batchcode)){
+            rqmap.put("batchcode",batchcode);
+        }
+        //委托方
+//        String entrustName=request.getString("entrust_name");
+//        if(StringUtils.isNotBlank(entrustName)){
+//            rqmap.put("entrust_name",entrustName);
+//        }
+
+        //购买方
+//        String buyName=request.getString("buy_name");
+//        if(StringUtils.isNotBlank(buyName)){
+//            rqmap.put("buy_name",buyName);
+//        }
+
+        //商品名称
+        String goodsName=request.getString("goods_name");
+        if(StringUtils.isNotBlank(goodsName)){
+            rqmap.put("goods_name",goodsName);
+        }
+        // 订单类型
+        String orderType= request.getString("order_type");
+        if(StringUtils.isNotBlank(orderType)){
+            rqmap.put("order_type",orderType);
+        }
+        //充值类型
+        String chargesType= request.getString("charges_type");
+        if(StringUtils.isNotBlank(chargesType)){
+            rqmap.put("charges_type",chargesType);
+        }
+        //订单状态
+        String transaction_status=request.getString("transaction_status");
+        if(StringUtils.isNotBlank(transaction_status)){
+            rqmap.put("status",transaction_status);
         }
-        String spage=request.getString("page");
         //
+        String spage=request.getString("page");
         int page= StringUtils.isNotBlank(spage)?Integer.valueOf(spage):1;
-
+        //
         String slimit=request.getString("limit");
         int limit = StringUtils.isNotBlank(slimit)?Integer.valueOf(slimit):10;
 
-        Map map = orderService.getOrderList(odmap,page,limit);
+        Map map = orderService.getOrderList(rqmap,page,limit);
 
         jsonObject.put("code",200);
         jsonObject.put("msg","操作成功");
diff --git a/src/main/resources/mapper/szwh/OrderMapper.xml b/src/main/resources/mapper/szwh/OrderMapper.xml
index a4a98a9..eb78cb3 100644
--- a/src/main/resources/mapper/szwh/OrderMapper.xml
+++ b/src/main/resources/mapper/szwh/OrderMapper.xml
@@ -70,7 +70,7 @@
                 </foreach>
             </if>
             <if test="map==null">
-                id>#{start}
+                id>#{startRs}
             </if>
         </where>
         limit #{pageSize}
diff --git a/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java
index 3fc7e98..54ec183 100644
--- a/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java
+++ b/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java
@@ -44,6 +44,9 @@ public class OrderMapperTest {
         int pagesize=10;
         //
         List<Order> lolist = orderMapper.getOrderList(wcon,starrs,pagesize);
+        for(Order o:lolist){
+            System.out.println(o.getBatchcode());
+        }
         System.out.println(lolist.size());
     }