* 新需求

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

@@ -0,0 +1,43 @@
+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 RedPacketRankingListExport {
+
+
+    @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 votes;
+}

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

@@ -1,17 +1,25 @@
 package com.huiju.estateagents.redpack.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
+import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
+import com.huiju.estateagents.redpack.service.ITaRedPacketPersonService;
 import com.huiju.estateagents.redpack.service.ITaRedPacketService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
  * 红包助力活动  前端控制器
@@ -29,6 +37,12 @@ public class TaRedPacketController extends BaseController {
     @Autowired
     public ITaRedPacketService iTaRedPacketService;
 
+    @Autowired
+    private ITaOrgOrderService iTaOrgOrderService;
+
+    @Autowired
+    private ITaRedPacketPersonService iTaRedPacketPersonService;
+
 
     /**
      * 分页查询列表
@@ -142,4 +156,91 @@ public class TaRedPacketController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 条件查询红包发送记录
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orderId
+     * @param wxOrderId
+     * @param tradeNo
+     * @param phone
+     * @param status
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/redPacket/listSendRecord", method = RequestMethod.GET)
+    public ResponseBean listSendRecord(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       String activityId,
+                                       String orderId,
+                                       String wxOrderId,
+                                       String tradeNo,
+                                       String phone,
+                                       Integer status,
+                                       HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.listRedPacketRecords(pageNum, pageSize, phone, activityId, orderId, wxOrderId, tradeNo, status, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("listSendRecord -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取红包排行榜
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param activityId
+     * @param phone
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "getRedPacketRankingList", method = RequestMethod.GET)
+    public ResponseBean getRedPacketRankingList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                String activityId,
+                                                String phone,
+                                                HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaRedPacketPersonService.getRedPacketRankingList(pageNum, pageSize, activityId, phone, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("getRedPacketRankingList -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 导出红包排行榜
+     *
+     * @param activityId
+     * @param phone
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "exportRedPacketRankingList", method = RequestMethod.GET)
+    public void exportRedPacketRankingList(String activityId,
+                                           String phone,
+                                           HttpServletRequest request,
+                                           HttpServletResponse response) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            iTaRedPacketPersonService.exportRedPacketRankingList(activityId, phone, getOrgId(request), response);
+        } catch (Exception e) {
+            logger.error("exportRefundOrderByCondition 异常：", 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

@@ -112,4 +112,24 @@ public class TaOrgOrder implements Serializable {
 
     @TableField(exist = false)
     private String phone;
+
+    /**
+     * 接收红包人昵称
+     */
+    @TableField(exist = false)
+    private String nickname;
+
+    /**
+     * 子订单金额
+     */
+    @TableField(exist = false)
+    private String detailAmount;
+
+    /**
+     * 接受红包人头像
+     */
+    @TableField(exist = false)
+    private String avatarurl;
+
+
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.redpack.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -89,5 +90,26 @@ public class TaRedPacketPerson implements Serializable {
      */
     private Integer packetStatus;
 
+    @TableField(exist = false)
+    private String phone;
+
+    /**
+     * 接收红包人昵称
+     */
+    @TableField(exist = false)
+    private String nickname;
+
+    /**
+     * 接受红包人名称
+     */
+    @TableField(exist = false)
+    private String name;
+
+    /**
+     * 接受红包人头像
+     */
+    @TableField(exist = false)
+    private String avatarurl;
+
 
 }

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

@@ -138,11 +138,31 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                                                  @Param("orgId") Integer orgId);
 
 
-
     /**
      * 总充值金额
+     *
      * @param orgId
      * @return
      */
     Integer countTotalRechargeAmount(@Param("orgId") Integer orgId);
+
+    /**
+     * 条件查询红包发送记录
+     *
+     * @param page
+     * @param orderId
+     * @param wxOrderId
+     * @param tradeNo
+     * @param status
+     * @param orgId
+     * @return
+     */
+    IPage<TaOrgOrder> listRedPacketRecords(IPage<TaOrgOrder> page,
+                                           @Param("phone") String phone,
+                                           @Param("activityId") String activityId,
+                                           @Param("orderId") String orderId,
+                                           @Param("wxOrderId") String wxOrderId,
+                                           @Param("tradeNo") String tradeNo,
+                                           @Param("status") Integer status,
+                                           @Param("orgId") Integer orgId);
 }

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

@@ -1,10 +1,15 @@
 package com.huiju.estateagents.redpack.mapper;
 
-import com.huiju.estateagents.redpack.entity.TaRedPacketPerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.excel.redPacket.RedPacketRankingListExport;
+import com.huiju.estateagents.redpack.entity.TaRedPacketPerson;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * <p>
  * 红包助力报名表  Mapper 接口
@@ -17,4 +22,31 @@ import org.springframework.stereotype.Component;
 @Component
 public interface TaRedPacketPersonMapper extends BaseMapper<TaRedPacketPerson> {
 
+    /**
+     * 获取红包活动排行榜
+     *
+     * @param page
+     * @param activityId
+     * @param orgId
+     * @param phone
+     * @return
+     */
+    IPage<TaRedPacketPerson> getRedPacketRankingList(IPage<TaRedPacketPerson> page,
+                                                     @Param("activityId") String activityId,
+                                                     @Param("orgId") Integer orgId,
+                                                     @Param("phone") String phone);
+
+    /**
+     * 导出红包活动排行榜
+     *
+     * @param activityId
+     * @param orgId
+     * @param phone
+     * @return
+     */
+    List<RedPacketRankingListExport> exportRedPacketRankingList(@Param("activityId") String activityId,
+                                                                @Param("orgId") Integer orgId,
+                                                                @Param("phone") String phone);
+
+
 }

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

@@ -137,4 +137,18 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @throws Exception
      */
     void exportRefundOrderByCondition(LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, Integer orgId, HttpServletResponse response) throws Exception;
+
+    /**
+     * 条件查询红包发送记录
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orderId
+     * @param wxOrderId
+     * @param tradeNo
+     * @param status
+     * @param orgId
+     * @return
+     */
+    ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone,String activityId, String orderId, String wxOrderId, String tradeNo, Integer status, Integer orgId);
 }

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

@@ -1,8 +1,11 @@
 package com.huiju.estateagents.redpack.service;
 
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.redpack.entity.TaRedPacketPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * <p>
  * 红包助力报名表  服务类
@@ -13,4 +16,26 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaRedPacketPersonService extends IService<TaRedPacketPerson> {
 
+    /**
+     * 查询红包活动排行榜
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param activityId
+     * @param phone
+     * @param orgId
+     * @return
+     */
+    ResponseBean getRedPacketRankingList(Integer pageNum, Integer pageSize, String activityId, String phone, Integer orgId);
+
+    /**
+     * 导出红包活动排行榜
+     *
+     * @param activityId
+     * @param phone
+     * @param orgId
+     * @param response
+     */
+    void exportRedPacketRankingList(String activityId, String phone, Integer orgId, HttpServletResponse response) throws Exception;
+
 }

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

@@ -309,6 +309,14 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         EasyExcel.write(response.getOutputStream(), AccountRefundRecordExport.class).sheet("退款订单").doWrite(records);
     }
 
+    @Override
+    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));
+        return responseBean;
+    }
+
     /**
      * 获取每个小程序独立的微信账户
      *

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

@@ -1,11 +1,21 @@
 package com.huiju.estateagents.redpack.service.impl;
 
+import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.excel.redPacket.RedPacketRankingListExport;
 import com.huiju.estateagents.redpack.entity.TaRedPacketPerson;
 import com.huiju.estateagents.redpack.mapper.TaRedPacketPersonMapper;
 import com.huiju.estateagents.redpack.service.ITaRedPacketPersonService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
+import java.util.List;
+
 /**
  * <p>
  * 红包助力报名表  服务实现类
@@ -17,4 +27,26 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaRedPacketPersonServiceImpl extends ServiceImpl<TaRedPacketPersonMapper, TaRedPacketPerson> implements ITaRedPacketPersonService {
 
+    @Autowired
+    private TaRedPacketPersonMapper taRedPacketPersonMapper;
+
+    @Override
+    public ResponseBean getRedPacketRankingList(Integer pageNum, Integer pageSize, String activityId, String phone, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaRedPacketPerson> pg = new Page<>(pageNum, pageSize);
+        responseBean.addSuccess(taRedPacketPersonMapper.getRedPacketRankingList(pg, activityId, orgId, phone));
+        return responseBean;
+    }
+
+    @Override
+    public void exportRedPacketRankingList(String activityId, String phone, Integer orgId, HttpServletResponse response) throws Exception{
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        List<RedPacketRankingListExport> records = taRedPacketPersonMapper.exportRedPacketRankingList(activityId,orgId,phone);
+        String fileName = URLEncoder.encode("排行榜", "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        EasyExcel.write(response.getOutputStream(), RedPacketRankingListExport.class).sheet("排行榜").doWrite(records);
+    }
+
+
 }

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

@@ -224,5 +224,39 @@
         and a.item_type = 'recharge'
     </select>
 
-
+    <select id="listRedPacketRecords" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
+        SELECT
+            t.*,
+            t2.amount detailAmount,
+            t3.phone,
+            ifNull( t3.NAME, t3.nickname ) nickname,
+            t3.avatarurl
+        FROM
+            ta_org_order t
+            INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id
+            LEFT JOIN ta_person t3 ON t2.receiver_id = t3.person_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t2.target_id = #{activityId}
+            AND t2.target_type = 'redPacket'
+            AND t2.item_type = 'redPacket'
+            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="status != null">
+                AND t.status = #{status}
+            </if>
+            <if test = "phone != null and phone != ''">
+                AND t3.phone like concat ('%',phone,'%')
+            </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

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

@@ -2,8 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.redpack.mapper.TaRedPacketHistoryMapper">
 
-    <select id="listHistoryByCondition" resultType="com.huiju.estateagents.redpack.entity.TaRedPacketHistory">
 
-    </select>
 
 </mapper>

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

@@ -2,4 +2,49 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.redpack.mapper.TaRedPacketPersonMapper">
 
+    <select id="getRedPacketRankingList" resultType="com.huiju.estateagents.redpack.entity.TaRedPacketPerson">
+        SELECT
+            t.*,
+            t2.phone,
+            t2.NAME,
+            t2.nickname nickname,
+            t2.avatarurl
+        FROM
+            ta_red_packet_person t
+            LEFT JOIN ta_person t2 ON t.miniapp_person_id = t2.person_id
+        WHERE
+            t.activity_id = #{activityId}
+            AND t.org_id = #{orgId}
+            AND t.is_signed_up = TRUE
+            <if test = "phone != null and phone != ''">
+                AND t2.phone like concat('%',#{phone},'%')
+            </if>
+        ORDER BY
+            t.votes DESC
+    </select>
+
+    <select id="exportRedPacketRankingList" resultType="com.huiju.estateagents.excel.redPacket.RedPacketRankingListExport">
+        SELECT
+            t.votes,
+            t.crate_date,
+            t2.phone,
+            t2.NAME,
+            t2.nickname nickname,
+            t2.avatarurl
+        FROM
+            ta_red_packet_person t
+            LEFT JOIN ta_person t2 ON t.miniapp_person_id = t2.person_id
+        WHERE
+            t.activity_id = #{activityId}
+            AND t.org_id = #{orgId}
+            AND t.is_signed_up = TRUE
+            <if test = "phone != null and phone != ''">
+                AND t2.phone like concat('%',#{phone},'%')
+            </if>
+        ORDER BY
+            t.votes DESC
+    </select>
+
+
+
 </mapper>