diff --git a/src/main/java/cn/chjyj/szwh/dto/OrderTicketDTO.java b/src/main/java/cn/chjyj/szwh/dto/OrderTicketDTO.java
new file mode 100644
index 0000000..6e514a9
--- /dev/null
+++ b/src/main/java/cn/chjyj/szwh/dto/OrderTicketDTO.java
@@ -0,0 +1,135 @@
+package cn.chjyj.szwh.dto;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单发票联合查询映射
+ */
+public class OrderTicketDTO {
+    private String status; //order 状态
+    private String name;
+    private Integer id;
+    private String pdfUrl;
+    private String uscc;
+    private String tickettime;
+    private String ticketid;
+    private String batchcode;
+    private Integer ticket_status;
+    private String ticketimage;
+    private String ticketurl;
+    private BigDecimal ticketmoney;
+    private String islicode;
+    private String ticketApiMessage;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getPdfUrl() {
+        return pdfUrl;
+    }
+
+    public void setPdfUrl(String pdfUrl) {
+        this.pdfUrl = pdfUrl;
+    }
+
+    public String getUscc() {
+        return uscc;
+    }
+
+    public void setUscc(String uscc) {
+        this.uscc = uscc;
+    }
+
+    public String getTickettime() {
+        return tickettime;
+    }
+
+    public void setTickettime(String tickettime) {
+        this.tickettime = tickettime;
+    }
+
+    public String getTicketid() {
+        return ticketid;
+    }
+
+    public void setTicketid(String ticketid) {
+        this.ticketid = ticketid;
+    }
+
+    public String getBatchcode() {
+        return batchcode;
+    }
+
+    public void setBatchcode(String batchcode) {
+        this.batchcode = batchcode;
+    }
+
+    public Integer getTicket_status() {
+        return ticket_status;
+    }
+
+    public void setTicket_status(Integer ticket_status) {
+        this.ticket_status = ticket_status;
+    }
+
+    public String getTicketimage() {
+        return ticketimage;
+    }
+
+    public void setTicketimage(String ticketimage) {
+        this.ticketimage = ticketimage;
+    }
+
+    public String getTicketurl() {
+        return ticketurl;
+    }
+
+    public void setTicketurl(String ticketurl) {
+        this.ticketurl = ticketurl;
+    }
+
+    public BigDecimal getTicketmoney() {
+        return ticketmoney;
+    }
+
+    public void setTicketmoney(BigDecimal ticketmoney) {
+        this.ticketmoney = ticketmoney;
+    }
+
+    public String getIslicode() {
+        return islicode;
+    }
+
+    public void setIslicode(String islicode) {
+        this.islicode = islicode;
+    }
+
+    public String getTicketApiMessage() {
+        return ticketApiMessage;
+    }
+
+    public void setTicketApiMessage(String ticketApiMessage) {
+        this.ticketApiMessage = ticketApiMessage;
+    }
+}
diff --git a/src/main/java/cn/chjyj/szwh/mapper/TicketMapper.java b/src/main/java/cn/chjyj/szwh/mapper/TicketMapper.java
index 9eb6539..26190dc 100644
--- a/src/main/java/cn/chjyj/szwh/mapper/TicketMapper.java
+++ b/src/main/java/cn/chjyj/szwh/mapper/TicketMapper.java
@@ -1,9 +1,12 @@
 package cn.chjyj.szwh.mapper;
 
 import cn.chjyj.szwh.bean.Ticket;
+import cn.chjyj.szwh.dto.OrderTicketDTO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 发票mapper
@@ -16,4 +19,20 @@ public interface TicketMapper {
      * @return
      */
     List<Ticket> getTicketLikeTid(String ticketId);
+
+    /**
+     * 查询列表
+     * @param map
+     * @param start
+     * @param ilimit
+     * @return
+     */
+    List<OrderTicketDTO> getOrderTicketList(@Param("map") Map map, @Param("start") int start, @Param("limit") int ilimit);
+
+    /**
+     * 统计符合条件的数量
+     * @param map
+     * @return
+     */
+    int countOrderTicket(Map map);
 }
diff --git a/src/main/resources/mapper/szwh/TiketMapper.xml b/src/main/resources/mapper/szwh/TiketMapper.xml
new file mode 100644
index 0000000..ba597a5
--- /dev/null
+++ b/src/main/resources/mapper/szwh/TiketMapper.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.chjyj.szwh.mapper.TicketMapper">
+
+    <sql id="column">
+     id,batchcode,islicode,ticketid,ticketmoney,pdfUrl,ticketurl,ticketimage
+     ticket_status as ticketStatus,ticketApiMessage,tickettime
+    </sql>
+    <sql id="tbName">ticket</sql>
+
+    <!--模糊查找-->
+    <select id="getTicketLikeTid" parameterType="java.lang.String" resultType="cn.chjyj.szwh.bean.Ticket">
+        SELECT <include refid="column"/>
+        FROM <include refid="tbName"/>
+        WHERE ticketid like concat('%',#{ticketId},'%');
+    </select>
+
+    <!-- 多条件查找 -->
+    <select id="getOrderTicketList" parameterType="java.util.Map" resultType="cn.chjyj.szwh.dto.OrderTicketDTO">
+        SELECT o.`status`,u.`name`,ticket.id,ticket.pdfUrl,u.uscc,ticket.tickettime,ticket.ticketid,ticket.batchcode,
+                    ticket.ticket_status,ticket.ticketimage,ticket.ticketurl,ticket.ticketmoney,ticket.islicode,ticket.ticketApiMessage
+        FROM ticket
+        INNER JOIN order_user u ON u.batchcode = ticket.batchcode AND u.islicode = ticket.islicode
+        INNER JOIN `order` as o ON o.batchcode = ticket.batchcode
+        <where>
+            <if test="map!=null">
+                <foreach collection="map" item="v" index="k" separator="and">
+                    <if test="v != null and v != '' and k!='ticketid' and k!='u.name'">
+                        ${k} = #{v}
+                    </if>
+                    <if test="k=='ticketid'">
+                        ticket.ticketid like concat ('%',#{v},'%')
+                    </if>
+                    <if test="k=='u.name'">
+                        u.name like concat ('%',#{v},'%')
+                        OR ticket.islicode like concat ('%',#{v},'%')
+                    </if>
+                </foreach>
+            </if>
+        </where>
+        ORDER BY ticket.tickettime DESC
+        LIMIT #{start},#{limit}
+    </select>
+
+    <!--统计符合条件的-->
+    <select id="countOrderTicket" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT o.`status`,u.`name`,ticket.id,ticket.pdfUrl,u.uscc,ticket.tickettime,ticket.ticketid,ticket.batchcode,
+        ticket.ticket_status,ticket.ticketimage,ticket.ticketurl,ticket.ticketmoney,ticket.islicode,ticket.ticketApiMessage
+        FROM ticket
+        INNER JOIN order_user u ON u.batchcode = ticket.batchcode AND u.islicode = ticket.islicode
+        INNER JOIN `order` as o ON o.batchcode = ticket.batchcode
+        <where>
+            <if test="map!=null">
+                <foreach collection="map" item="v" index="k" separator="and">
+                    <if test="v != null and v != '' and k!='ticketid' and k!='u.name'">
+                        ${k} = #{v}
+                    </if>
+                    <if test="k=='ticketid'">
+                        ticket.ticketid like concat ('%',#{v},'%')
+                    </if>
+                    <if test="k=='u.name'">
+                        u.name like concat ('%',#{v},'%')
+                        OR ticket.islicode like concat ('%',#{v},'%')
+                    </if>
+
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <!-- 统计订单总数 -->
+    <select id="countAllOrder" resultType="java.lang.Integer">
+        select count(*) from
+        <include refid="tbName"/>
+        ;
+    </select>
+
+    <!--订单条件查询-->
+    <select id="getOrderList" parameterType="java.util.Map" resultType="cn.chjyj.szwh.bean.Order">
+        select
+        <include refid="column"/>
+        from
+        <include refid="tbName"/>
+        <where>
+            <if test="map!=null">
+                <!-- 查询条件封装在map中，以k-v形式进行查询-->
+                <foreach collection="map" item="v" index="k" separator="and">
+                    <if test="v != null and v != '' and k!='id' and k!='charges_type'">
+                        ${k} = #{v}
+                    </if>
+                    <if test="k=='id'">
+                        ${k}>#{v}
+                    </if>
+                </foreach>
+            </if>
+            <if test="map==null">
+                id>#{startRs}
+            </if>
+        </where>
+        limit #{pageSize}
+    </select>
+
+    <!-- 根据不同状态代码统计 -->
+    <select id="countOrderByStatus" resultType="java.lang.Integer" parameterType="java.lang.Integer">
+        select count(*) from
+        <include refid="tbName"/>
+        where `status`=#{status}
+    </select>
+
+    <!--统计某个时间段订单数量-->
+    <select id="countOrderTimeSection" resultType="java.lang.Integer">
+        select count(*) from
+        <include refid="tbName"/>
+        where #{key} between ${startTime} and ${endTime}
+    </select>
+
+    <!-- 统计多个条件的总数 -->
+    <select id="countOrderByMap" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(*)
+        from <include refid="tbName"/>
+        <where>
+            <if test="map!=null">
+                <!-- 查询条件封装在map中，以k-v形式进行查询-->
+                <foreach collection="map" item="v" index="k" separator="and">
+                    <if test="v != null and v != '' and k!='id' and k!='charges_type'">
+                        ${k} = #{v}
+                    </if>
+                    <if test="k=='id'">
+                        ${k}>#{v}
+                    </if>
+                </foreach>
+            </if>
+            <if test="map==null">
+                id>#{startRs}
+            </if>
+        </where>
+
+    </select>
+
+    <!-- 条件订单总额 -->
+    <select id="sumOrderByMap" parameterType="java.util.Map" resultType="java.math.BigDecimal">
+        select sum(#{cmap.field}) from
+        <include refid="tbName"/>
+        where ${cmap.wherestr};
+    </select>
+
+    <!-- 统计平台在某时间内的订单总额 -->
+    <select id="sumOderDtZone" parameterType="java.lang.String" resultType="java.math.BigDecimal">
+        SELECT COALESCE(SUM(${field}),0)
+        FROM `order`
+        WHERE pay_status=2
+        AND (paymenttime BETWEEN CAST(#{startdt} AS DATE) AND CAST(#{enddt} AS DATE))
+    </select>
+
+    <!--新增用户-->
+    <insert id="addUser" parameterType="cn.chjyj.szwh.bean.Goods" useGeneratedKeys="true" keyColumn="uid">
+        insert into
+        <include refid="tbName"/>
+        (uname,password,gender,urealname,ubirth,nickname,avatarurl,platfrom,sessionkey,openid)
+        values (
+        #{uname},
+        #{password},
+        #{gender},
+        #{urealname},
+        #{ubirth},
+        #{nickname},
+        #{avatarurl},
+        #{platfrom},
+        #{sessionkey},
+        #{openid}
+        )
+    </insert>
+
+    <!--更新-->
+    <update id="updateOrderStatus">
+        update
+        <include refid="tbName"/>
+        <set>
+            <foreach collection="map" item="v" index="k" separator="and">
+                <if test="v != null and v != ''">
+                    ${k} = #{v}
+                </if>
+            </foreach>
+        </set>
+        where id=#{id}
+    </update>
+
+
+</mapper>
\ No newline at end of file