diff --git a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
index ede5efc..56027d8 100644
--- a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
@@ -1,7 +1,9 @@
 package cn.chjyj.szwh.controller.api;
 
 import cn.chjyj.szwh.controller.BaseController;
+import cn.chjyj.szwh.service.OrderService;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -14,6 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(name = "/api/Order",method = RequestMethod.POST)
 public class OrderController extends BaseController {
+    @Autowired
+    private OrderService orderService;
     /**
      * 获取订单信息
      * @param batchcode
diff --git a/src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java b/src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java
index f980b3f..1287d41 100644
--- a/src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java
+++ b/src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java
@@ -1,11 +1,53 @@
 package cn.chjyj.szwh.mapper;
 
+import cn.chjyj.szwh.bean.Order;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.security.PermitAll;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 订单信息
  */
 @Component
 public interface OrderMapper {
+    /**
+     * 分页查询订单
+     * @param startrs
+     * @param pageSize
+     * @return
+     */
+    List<Order> getAllOrderList(@Param("startRs") int startrs,@Param("pageSize") int pageSize);
+    /**
+     * 根据条件查询订单列表
+     * @param qumap
+     * @return
+     */
+    List<Order> getOrderList(@Param("map") Map<String,Object> qumap,
+                             @Param("startRs")Integer starrs,
+                             @Param("pageSize") Integer pagesize
+                             );
+
+    /**
+     * 根据编号查询订单信息
+     * @param id
+     * @return
+     */
+    Order getOrderById(Integer id);
+
+    /**
+     * 根据订单号
+     * @param batchcode
+     * @return
+     */
+    Order getOrderByBatchcode(String batchcode);
 
+    /**
+     * 更新订单状态
+     * @param order
+     * @return
+     */
+    int updateOrderStatus(Order order);
 }
diff --git a/src/main/java/cn/chjyj/szwh/service/OrderService.java b/src/main/java/cn/chjyj/szwh/service/OrderService.java
new file mode 100644
index 0000000..b43d483
--- /dev/null
+++ b/src/main/java/cn/chjyj/szwh/service/OrderService.java
@@ -0,0 +1,12 @@
+package cn.chjyj.szwh.service;
+
+import cn.chjyj.szwh.bean.Order;
+
+import java.util.List;
+
+/**
+ * 订单service接口
+ */
+public interface OrderService {
+    public List<Order> getOrderList();
+}
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
new file mode 100644
index 0000000..3ac35c9
--- /dev/null
+++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
@@ -0,0 +1,18 @@
+package cn.chjyj.szwh.service.impl;
+
+import cn.chjyj.szwh.bean.Order;
+import cn.chjyj.szwh.service.OrderService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 订单服务实现
+ */
+@Service
+public class OrderServiceImpl implements OrderService {
+    @Override
+    public List<Order> getOrderList() {
+        return null;
+    }
+}
diff --git a/src/main/resources/mapper/szwh/OrderMapper.xml b/src/main/resources/mapper/szwh/OrderMapper.xml
index b31dce6..085c161 100644
--- a/src/main/resources/mapper/szwh/OrderMapper.xml
+++ b/src/main/resources/mapper/szwh/OrderMapper.xml
@@ -16,8 +16,11 @@
     <sql id="tbName">`order`</sql>
 
     <!--查询记录列表-->
-    <select id="getGoodsList" parameterType="java.lang.Integer" resultType="cn.chjyj.szwh.bean.Goods">
-        WITH mm as (select * from
+    <select id="getAllOrderList" parameterType="java.lang.Integer" resultType="cn.chjyj.szwh.bean.Order">
+        WITH mm as (
+        select
+        <include refid="column"/>
+        from
         <include refid="tbName"/>
         where id>#{startRs} limit #{pageSize}
         )SELECT * FROM mm ORDER BY id DESC;
@@ -25,28 +28,45 @@
 
     <!--根据uid查询用户-->
     <select id="getUserByUid" parameterType="java.lang.Integer" resultType="cn.chjyj.szwh.bean.Goods">
-        select <include refid="column"/>
-        from <include refid="tbName"/>
+        select
+        <include refid="column"/>
+        from
+        <include refid="tbName"/>
         where uid=#{uid}
     </select>
 
     <!--查询用户名,加上密码-->
     <select id="getUserByUname" parameterType="java.lang.String" resultType="cn.chjyj.szwh.bean.Goods">
-        select <include refid="column"/>,password
-        from <include refid="tbName"/>
+        select<include refid="column"/>,password
+        from
+        <include refid="tbName"/>
         where uname=#{uname} limit 1;
     </select>
 
-    <!--查询用户-->
-    <select id="getSingleUserByOpenid" parameterType="java.lang.String" resultType="cn.chjyj.szwh.bean.Goods">
-        select <include refid="column"/> from
+    <!--订单条件查询-->
+    <select id="getOrderList" parameterType="java.util.Map" resultType="cn.chjyj.szwh.bean.Order">
+        select
+        <include refid="column"/>
+        from
         <include refid="tbName"/>
-        where openid=#{openid};
+        <where>
+            <!-- 查询条件封装在map中，以k-v形式进行查询-->
+            <foreach collection="map" item="v" index="k" separator="and">
+                <if test="v != null and v != ''">
+                    ${k} = #{v}
+                </if>
+            </foreach>
+            <if test="map.startrs!=null">
+                and id>#{map.startrs}
+            </if>
+        </where>
+        id>#{startRs} limit #{pageSize}
     </select>
 
     <!--新增用户-->
     <insert id="addUser" parameterType="cn.chjyj.szwh.bean.Goods" useGeneratedKeys="true" keyColumn="uid">
-        insert into <include refid="tbName"/>
+        insert into
+        <include refid="tbName"/>
         (uname,password,gender,urealname,ubirth,nickname,avatarurl,platfrom,sessionkey,openid)
         values (
         #{uname},
@@ -63,7 +83,8 @@
     </insert>
 
     <update id="upUser" parameterType="cn.chjyj.szwh.bean.Goods">
-        update <include refid="tbName"/>
+        update
+        <include refid="tbName"/>
         set
 
         <if test="password!=null">
diff --git a/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java
new file mode 100644
index 0000000..de90f7b
--- /dev/null
+++ b/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java
@@ -0,0 +1,56 @@
+package cn.chjyj.szwh.mapper;
+
+import cn.chjyj.szwh.bean.Order;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.internal.matchers.Or;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class OrderMapperTest {
+    @Autowired
+    private OrderMapper orderMapper;
+
+    @Test
+    public void getAllOrderList() {
+        int startrs=0;
+        int pagesize=20;
+        List<Order> olist = orderMapper.getAllOrderList(startrs,pagesize);
+        System.out.println(olist.size());
+    }
+
+    @Test
+    public void getOrderList() {
+        // 查询条件
+        Map<String,Object> wcon=new HashMap<>();
+        wcon.put("buy_islicode","999998-000000001923-9");
+        wcon.put("status",5);
+
+        int starrs=0;
+        int pagesize=10;
+        //
+        List<Order> lolist = orderMapper.getOrderList(wcon,starrs,pagesize);
+        System.out.println(lolist.size());
+    }
+
+    @Test
+    public void getOrderById() {
+    }
+
+    @Test
+    public void getOrderByBatchcode() {
+    }
+
+    @Test
+    public void updateOrderStatus() {
+    }
+}
\ No newline at end of file