* bug 修复

src/main/java/com/huiju/estateagents/excel/redPacket/AccountConsumeRecordExport.java

 
     @ColumnWidth(15)
     @ExcelProperty(value = "消费方式", index = 2)
-    private String a;
+    private String consumeType;
 
 
     @ColumnWidth(15)
     @ExcelProperty(value = "活动名称", index = 3)
-    private String b;
+    private String activityName;
 
     @ColumnWidth(15)
     @ExcelProperty(value = "消费下单时间", index = 4)
-    private String c;
+    private String createDate;
 
 
     @ColumnWidth(15)
     @ExcelProperty(value = "接收人手机号码", index = 5)
-    private String d;
+    private String phone;
 
     @ColumnWidth(15)
     @ExcelProperty(value = "消费状态", index = 5)
-    private String e;
+    private String consumeStatus;
 }

src/main/java/com/huiju/estateagents/excel/redPacket/RedPacketVisitRecordtExport.java

+package com.huiju.estateagents.excel.redPacket;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * 红包访问记录导出实体
+ *
+ * @author gusy
+ * @date 2020/6/7 15:46
+ */
+@Data
+public class RedPacketVisitRecordtExport {
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "头像", index = 0)
+    private String avatarurl;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "昵称", index = 1)
+    private String nickname;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 2)
+    private String name;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 3)
+    private String phone;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问时间", index = 4)
+    private String createDate;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享人昵称", index = 5)
+    private String sharePersonNickName;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享人手机号", index = 6)
+    private String sharePersonPhone;
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgOrderController.java

         }
     }
 
+    /**
+     * 获取消费订单列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param startTime   消费开始时间
+     * @param endTime     消费结束时间
+     * @param orderId     订单编号
+     * @param status      消费状态，1：成功，0：失败
+     * @param consumeType 消费方式，红包：redPacket
+     * @param phone       接收人手机号
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/listConsumeOrderByCondition", method = RequestMethod.GET)
+    public ResponseBean listConsumeOrderByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    @RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startTime,
+                                                    @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
+                                                    String orderId,
+                                                    Integer status,
+                                                    String consumeType,
+                                                    String phone,
+                                                    HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.listConsumeOrderByCondition(pageNum, pageSize, startTime, endTime, orderId, status, consumeType, phone, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("listConsumeOrderByCondition -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 导出消费订单列表
+     *
+     * @param startTime
+     * @param endTime
+     * @param orderId
+     * @param status
+     * @param consumeType
+     * @param phone
+     * @param request
+     * @param response
+     * @throws Exception
+     */
+    @RequestMapping(value = "/admin/orgOrder/exportConsumeOrderByCondition", method = RequestMethod.GET)
+    public void exportConsumeOrderByCondition(@RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startTime,
+                                              @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
+                                              String orderId,
+                                              Integer status,
+                                              String consumeType,
+                                              String phone,
+                                              HttpServletRequest request,
+                                              HttpServletResponse response) throws Exception {
+        try {
+            iTaOrgOrderService.exportConsumeOrderByCondition(startTime, endTime, orderId, status, consumeType, phone, getOrgId(request), response);
+        } catch (Exception e) {
+            logger.error("exportConsumeOrderByCondition 异常：", e);
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            Map<String, Object> map = new HashMap();
+            map.put("code", ResponseBean.ERROR_UNAVAILABLE);
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
+        }
+    }
+
 
 }

src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketController.java

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.Map;
 
             response.getWriter().println(JSON.toJSONString(map));
         }
     }
+
+    /**
+     * 查询客户访问数据
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param startTime
+     * @param endTime
+     * @param drainageId
+     * @param phone
+     * @param sharePersonPhone 分享人手机号
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/redPacket/listVisitRecordByCondition", method = RequestMethod.GET)
+    public ResponseBean listVisitRecordByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   @RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startTime,
+                                                   @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
+                                                   String drainageId,
+                                                   String phone,
+                                                   String sharePersonPhone,
+                                                   HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaRedPacketService.listVisitRecordByCondition(pageNum, pageSize, startTime, endTime, drainageId, phone, sharePersonPhone, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("listVisitRecordByCondition -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 导出客户访问数据
+     *
+     * @param startTime
+     * @param endTime
+     * @param drainageId
+     * @param phone
+     * @param sharePersonPhone
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/redPacket/exportVisitRecordByCondition", method = RequestMethod.GET)
+    public void exportVisitRecordByCondition(@RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startTime,
+                                             @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
+                                             String drainageId,
+                                             String phone,
+                                             String sharePersonPhone,
+                                             HttpServletRequest request,
+                                             HttpServletResponse response) throws Exception {
+        try {
+            iTaRedPacketService.exportVisitRecordByCondition(startTime, endTime, drainageId, phone, sharePersonPhone, getOrgId(request), response);
+        } catch (Exception e) {
+            logger.error("exportVisitRecordByCondition 异常：", e);
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            Map<String, Object> map = new HashMap();
+            map.put("code", ResponseBean.ERROR_UNAVAILABLE);
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
+        }
+    }
+
 }

src/main/java/com/huiju/estateagents/redpack/entity/TaOrgOrder.java

 
 /**
  * <p>
- * 组织订单表 
+ * 组织订单表
  * </p>
  *
  * @author fxf
     @TableField(exist = false)
     private String avatarurl;
 
+    /**
+     * 活动名称
+     */
+    @TableField(exist = false)
+    private String activityName;
+
 
 }

src/main/java/com/huiju/estateagents/redpack/mapper/TaOrgOrderMapper.java

 import java.time.LocalDate;
 import java.util.List;
 
+import com.huiju.estateagents.excel.redPacket.AccountConsumeRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountPayRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountRefundRecordExport;
 import org.apache.ibatis.annotations.Mapper;
                                            @Param("tradeNo") String tradeNo,
                                            @Param("status") Integer status,
                                            @Param("orgId") Integer orgId);
+
+    /**
+     * 查询消费订单列表
+     *
+     * @param page
+     * @param startTime
+     * @param endTime
+     * @param orderId
+     * @param status
+     * @param consumeType
+     * @param phone
+     * @param orgId
+     * @return
+     */
+    IPage<TaOrgOrder> listConsumeOrderByCondition(IPage<TaOrgOrder> page,
+                                                  @Param("startTime") LocalDate startTime,
+                                                  @Param("endTime") LocalDate endTime,
+                                                  @Param("orderId") String orderId,
+                                                  @Param("status") Integer status,
+                                                  @Param("consumeType") String consumeType,
+                                                  @Param("phone") String phone,
+                                                  @Param("orgId") Integer orgId);
+
+    /**
+     * 导出消费订单列表
+     *
+     * @param startTime
+     * @param endTime
+     * @param orderId
+     * @param status
+     * @param consumeType
+     * @param phone
+     * @param orgId
+     * @return
+     */
+    List<AccountConsumeRecordExport> exportConsumeOrderByCondition(@Param("startTime") LocalDate startTime,
+                                                                   @Param("endTime") LocalDate endTime,
+                                                                   @Param("orderId") String orderId,
+                                                                   @Param("status") Integer status,
+                                                                   @Param("consumeType") String consumeType,
+                                                                   @Param("phone") String phone,
+                                                                   @Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/redpack/mapper/TaRedPacketMapper.java

 package com.huiju.estateagents.redpack.mapper;
 
-import com.huiju.estateagents.redpack.entity.TaRedPacket;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaCustomerFrom;
+import com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport;
+import com.huiju.estateagents.redpack.entity.TaRedPacket;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
      * @return
      */
     Integer initRedPacketImages(@Param("activityId") String activityId);
+
+    /**
+     * 查询客户访问记录
+     *
+     * @param page
+     * @param startTime
+     * @param endTime
+     * @param drainageId
+     * @param phone
+     * @param sharePersonPhone
+     * @param orgId
+     * @return
+     */
+    IPage<TaCustomerFrom> listVisitRecordByCondition(IPage<TaCustomerFrom> page,
+                                                     @Param("startTime") LocalDate startTime,
+                                                     @Param("endTime") LocalDate endTime,
+                                                     @Param("drainageId") String drainageId,
+                                                     @Param("phone") String phone,
+                                                     @Param("sharePersonPhone") String sharePersonPhone,
+                                                     @Param("orgId") Integer orgId);
+
+
+    /**
+     *
+     * @param startTime
+     * @param endTime
+     * @param drainageId
+     * @param phone
+     * @param sharePersonPhone
+     * @param orgId
+     * @return
+     */
+    List<RedPacketVisitRecordtExport> exportVisitRecordByCondition(@Param("startTime") LocalDate startTime,
+                                                                   @Param("endTime") LocalDate endTime,
+                                                                   @Param("drainageId") String drainageId,
+                                                                   @Param("phone") String phone,
+                                                                   @Param("sharePersonPhone") String sharePersonPhone,
+                                                                   @Param("orgId") Integer orgId);
+
 }

src/main/java/com/huiju/estateagents/redpack/service/ITaOrgOrderService.java

      * @param orgId
      * @return
      */
-    ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone,String activityId, String orderId, String wxOrderId, String tradeNo, Integer status, Integer orgId);
+    ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone, String activityId, String orderId, String wxOrderId, String tradeNo, Integer status, Integer orgId);
+
+    /**
+     * 获取消费订单列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param startTime
+     * @param endTime
+     * @param orderId
+     * @param status
+     * @param consumeType
+     * @param phone
+     * @param orgId
+     * @return
+     */
+    ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, Integer status,
+                                             String consumeType, String phone, Integer orgId);
+
+    /**
+     * 导出消费订单列表
+     *
+     * @param startTime
+     * @param endTime
+     * @param orderId
+     * @param status
+     * @param consumeType
+     * @param phone
+     * @param orgId
+     * @param response
+     * @throws Exception
+     */
+    void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, Integer orgId, HttpServletResponse response) throws Exception;
 }

src/main/java/com/huiju/estateagents/redpack/service/ITaRedPacketService.java

 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
 
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+
 /**
  * <p>
  * 红包助力活动  服务类
      */
     TaRedPacket getRedPacketImages(TaRedPacket record);
 
+
+    /**
+     * 查询客户访问记录
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param startTime
+     * @param endTime
+     * @param drainageId
+     * @param phone
+     * @param sharePersonPhone
+     * @param orgId
+     * @return
+     */
+    ResponseBean listVisitRecordByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId);
+
+    /**
+     * 导出客户访问记录
+     *
+     * @param startTime
+     * @param endTime
+     * @param drainageId
+     * @param phone
+     * @param sharePersonPhone
+     * @param orgId
+     */
+    void exportVisitRecordByCondition(LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception;
+
+
 }

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

 import com.huiju.estateagents.common.wxpay.WXPayConstants;
 import com.huiju.estateagents.common.wxpay.WxConfig;
 import com.huiju.estateagents.entity.TaWxPayConfig;
+import com.huiju.estateagents.excel.redPacket.AccountConsumeRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountPayRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountRefundRecordExport;
 import com.huiju.estateagents.mapper.TaWxPayConfigMapper;
             return responseBean;
         }
 
-        // 3.创建账户腿狂申请表信息
+        // 3.创建账户退款申请表信息
         TaOrgRefundApplication taOrgRefundApplication = new TaOrgRefundApplication();
         taOrgRefundApplication.setOrgId(orgId);
         taOrgRefundApplication.setUserId(userId);
     }
 
     @Override
-    public ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize,String phone,String activityId, String orderId, String wxOrderId, String tradeNo, Integer status, Integer orgId) {
+    public ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone, String activityId, String orderId, String wxOrderId, String tradeNo, Integer status, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taOrgOrderMapper.listRedPacketRecords(pg,phone,activityId,orderId, wxOrderId, tradeNo, status, orgId));
+        responseBean.addSuccess(taOrgOrderMapper.listRedPacketRecords(pg, phone, activityId, orderId, wxOrderId, tradeNo, status, orgId));
         return responseBean;
     }
 
+    @Override
+    public ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
+        responseBean.addSuccess(taOrgOrderMapper.listConsumeOrderByCondition(pg, startTime, endTime, orderId, status, consumeType, phone, orgId));
+        return responseBean;
+    }
+
+    @Override
+    public void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, Integer orgId, HttpServletResponse response) throws Exception {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        List<AccountConsumeRecordExport> records = taOrgOrderMapper.exportConsumeOrderByCondition(startTime, endTime, orderId, status, consumeType, phone, orgId);
+        String fileName = URLEncoder.encode("消费订单", "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        EasyExcel.write(response.getOutputStream(), AccountConsumeRecordExport.class).sheet("消费订单").doWrite(records);
+    }
+
     /**
      * 获取每个小程序独立的微信账户
      *

src/main/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketServiceImpl.java

 package com.huiju.estateagents.redpack.service.impl;
 
+import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.CommonUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaCustomerFrom;
+import com.huiju.estateagents.excel.redPacket.RedPacketRankingListExport;
+import com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport;
 import com.huiju.estateagents.redpack.entity.TaH5Images;
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
 import com.huiju.estateagents.redpack.entity.TaRedPacketHelp;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
     private TaRedPacketMoneyMapper taRedPacketMoneyMapper;
 
     @Override
+    @Transactional
     public ResponseBean initializeRedPacket(TaRedPacket record) {
         ResponseBean responseBean = new ResponseBean();
 
         return record;
     }
 
+    @Override
+    public ResponseBean listVisitRecordByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaCustomerFrom> pg = new Page<>(pageNum,pageSize);
+        responseBean.addSuccess(taRedPacketMapper.listVisitRecordByCondition(pg,startTime,endTime,drainageId,phone,sharePersonPhone,orgId));
+        return responseBean;
+    }
+
+    @Override
+    public void exportVisitRecordByCondition(LocalDate startTime, LocalDate endTime, String drainageId,String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        List<RedPacketVisitRecordtExport> records = taRedPacketMapper.exportVisitRecordByCondition(startTime,endTime,drainageId,phone,sharePersonPhone,orgId);
+        String fileName = URLEncoder.encode("客户数据", "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        EasyExcel.write(response.getOutputStream(), RedPacketVisitRecordtExport.class).sheet("客户数据").doWrite(records);
+    }
+
     /**
      * 保存/更新红包图片信息
      *

src/main/resources/mapper/redpack/TaOrgOrderMapper.xml

             <if test = " payStartTime != null ">
                 AND t.pay_date &gt;= #{payStartTime}
             </if>
-            <if test = " payStartTime != null and">
-                AND t.pay_date &lt;= #{payStartTime}
+            <if test = " payEndTime != null ">
+                AND t.pay_date &lt;= #{payEndTime}
             </if>
             <if test = " tradingStatus != null">
                 AND t.trading_status = #{tradingStatus}
             <if test = " payStartTime != null ">
                 AND t.pay_date &gt;= #{payStartTime}
             </if>
-            <if test = " payStartTime != null and">
-                AND t.pay_date &lt;= #{payStartTime}
+            <if test = " payEndTime != null ">
+                AND t.pay_date &lt;= #{payEndTime}
             </if>
             <if test = " tradingStatus != null">
                 AND t.trading_status = #{tradingStatus}
 
     <select id="exportRefundOrderByCondition" resultType="com.huiju.estateagents.excel.redPacket.AccountRefundRecordExport">
         SELECT
-
-        FROM            t.order_id,
-        t.amount,
-        t.create_date,
-        ( CASE t3.audit_status WHEN 'agree' THEN '已退款' WHEN 'unagree' THEN '已驳回' ELSE '已申请' END ) tradingStatus,
-        t3.audit_result
+            t.order_id,
+            t.amount,
+            t.create_date,
+            ( CASE t3.audit_status WHEN 'agree' THEN '已退款' WHEN 'unagree' THEN '已驳回' ELSE '已申请' END ) tradingStatus,
+            t3.audit_result
+        FROM
             ta_org_order t
         INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id AND t2.item_type = 'refund'
         LEFT JOIN ta_org_refund_application t3 ON t.order_id = t3.order_id
         ORDER BY
             t.create_date DESC
     </select>
+
+    <select id = "listConsumeOrderByCondition" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
+        SELECT
+            t.*,
+            t3.phone
+            <if test="consumeType == 'redPacket'">
+                ,t4.activity_name
+            </if>
+        FROM
+            ta_org_order t
+            INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id
+                <if test="consumeType != null and consumeType != ''">
+                    AND t2.item_type = #{consumeType}
+                </if>
+            LEFT JOIN ta_person t3 on t2.receiver_id = t3.person_id
+            <if test="consumeType == 'redPacket'">
+                LEFT JOIN ta_red_packet t4 ON t2.target_id = t4.activity_id
+            </if>
+        WHERE
+            t.org_id = #{orgId}
+            AND t.`status` >- 1
+            <if test = " orderId != null and orderId != ''">
+                AND t.order_id like concat( '%',#{orderId},'%')
+            </if>
+            <if test = " tradeNo != null and tradeNo != ''">
+                AND t.trade_no like concat( '%',#{tradeNo},'%')
+            </if>
+            <if test = " wxOrderId != null and wxOrderId != ''">
+                AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
+            </if>
+            <if test = " startTime != null ">
+                AND t.create_date &gt;= #{startTime}
+            </if>
+            <if test = " entartTime != null and">
+                AND t.create_date &lt;= #{entartTime}
+            </if>
+            <if test = " status != null">
+                AND t2.status = #{status}
+            </if>
+            <if test = "phone != null and phone != ''">
+                AND t3.phone = #{phone}
+            </if>
+        ORDER BY
+            t.create_date DESC
+
+    </select>
+
+    <select id="exportConsumeOrderByCondition" resultType="com.huiju.estateagents.excel.redPacket.AccountConsumeRecordExport">
+        SELECT
+            t.order_id,
+            t.amount,
+            ( CASE t2.item_type WHEN 'redPacket' THEN '红包' ELSE '' END ) consumeType,
+            <if test="consumeType == 'redPacket'">
+                t4.activity_name,
+            </if>
+            t.create_date,
+            t3.phone,
+            ( CASE t2.STATUS WHEN 1 THEN '成功' WHEN 0 THEN '失败' ELSE '' END ) consumeStatus
+        FROM
+            ta_org_order t
+            INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id
+                <if test="consumeType != null and consumeType != ''">
+                    AND t2.item_type = #{consumeType}
+                </if>
+            LEFT JOIN ta_person t3 ON t2.receiver_id = t3.person_id
+            <if test="consumeType == 'redPacket'">
+                LEFT JOIN ta_red_packet t4 ON t2.target_id = t4.activity_id
+            </if>
+        WHERE
+            t.org_id = #{orgId}
+            AND t.`status` >- 1
+            <if test = " orderId != null and orderId != ''">
+                AND t.order_id like concat( '%',#{orderId},'%')
+            </if>
+            <if test = " tradeNo != null and tradeNo != ''">
+                AND t.trade_no like concat( '%',#{tradeNo},'%')
+            </if>
+            <if test = " wxOrderId != null and wxOrderId != ''">
+                AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
+            </if>
+            <if test = " startTime != null ">
+                AND t.create_date &gt;= #{startTime}
+            </if>
+            <if test = " entartTime != null and">
+                AND t.create_date &lt;= #{entartTime}
+            </if>
+            <if test = " status != null">
+                AND t2.status = #{status}
+            </if>
+            <if test = "phone != null and phone != ''">
+                AND t3.phone = #{phone}
+            </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/redpack/TaRedPacketMapper.xml

             t2.activity_id = 1
     </insert>
 
+    <select id = "listVisitRecordByCondition" resultType="com.huiju.estateagents.entity.TaCustomerFrom">
+        SELECT
+            t.*,
+            t2.nickname,
+            t2.NAME,
+            t2.avatarurl,
+            t2.phone,
+            t3.nickname sharePersonNickname,
+            t3.phone sharePersonPhone
+        FROM
+            ta_customer_from t
+            LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+            LEFT JOIN ta_person t3 ON t.share_person_id = t2.person_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.target_type IN ( 'h5', 'dynamic' )
+            AND t.target_id = #{drainageId}
+            <if test = "startTime != null">
+                AND t.create_date &gt;= #{startTime}
+            </if>
+
+             <if test = "endTime != null">
+                 AND t.create_date &lt;= #{endTime}
+            </if>
+
+            <if test="sharePersonPhone != null and sharePersonPhone != ''">
+                AND t3.phone = #{sharePersonPhone}
+            </if>
+            <if test="phone != null and phone != ''">
+                AND t2.phone = #{phone}
+            </if>
+         ORDER BY
+            t.create_date desc
+    </select>
+
+    <select id = "exportVisitRecordByCondition" resultType="com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport">
+        SELECT
+        t.create_date
+        t2.nickname,
+        t2.NAME,
+        t2.avatarurl,
+        t2.phone,
+        t3.nickname sharePersonNickname,
+        t3.phone sharePersonPhone
+        FROM
+        ta_customer_from t
+        LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+        LEFT JOIN ta_person t3 ON t.share_person_id = t2.person_id
+        WHERE
+        t.org_id = #{orgId}
+        AND t.target_type IN ( 'h5', 'dynamic' )
+        AND t.target_id = #{drainageId}
+        <if test = "startTime != null">
+            AND t.create_date &gt;= #{startTime}
+        </if>
+
+        <if test = "endTime != null">
+            AND t.create_date &lt;= #{endTime}
+        </if>
+
+        <if test="sharePersonPhone != null and sharePersonPhone != ''">
+            AND t3.phone = #{sharePersonPhone}
+        </if>
+        <if test="phone != null and phone != ''">
+            AND t2.phone = #{phone}
+        </if>
+        ORDER BY
+        t.create_date desc
+    </select>
+
 </mapper>