Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/common/CommonUtils.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.common;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Random;
@@ -35,9 +36,38 @@ public class CommonUtils {
         return uuid;
     }
 
-    public static String generateTradeNo(String tradeType){
+    /**
+     * 生成订单号
+     *
+     * @param tradeType
+     * @return
+     */
+    public static String generateTradeNo(String tradeType) {
         String sdf = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
         int randNum = (int) (new Random().nextDouble() * (9999 - 1000 + 1)) + 1000;// 获取5位随机数
-        return tradeType+sdf+randNum;
+        return tradeType + sdf + randNum;
+    }
+
+    /**
+     * 元转分
+     *
+     * @param money
+     * @return
+     */
+    public static Integer yuanToFen(Double money) {
+        Double moneyd = money * 100;
+        Integer moneyi = moneyd.intValue();
+        return moneyi;
+    }
+
+    /**
+     * 元转分
+     *
+     * @param money
+     * @return
+     */
+    public static Double fenToYuan(Integer money) {
+        return Double.parseDouble(BigDecimal.valueOf(Long.valueOf(money)).divide(new BigDecimal(100)).toString());
+
     }
 }

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

@@ -0,0 +1,47 @@
+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/5 16:36
+ */
+@Data
+public class AccountConsumeRecordExport {
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "订单编号", index = 0)
+    private String orderId;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费金额", index = 1)
+    private String amount;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费方式", index = 2)
+    private String a;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "活动名称", index = 3)
+    private String b;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费下单时间", index = 4)
+    private String c;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "接收人手机号码", index = 5)
+    private String d;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费状态", index = 5)
+    private String e;
+}

src/main/java/com/huiju/estateagents/excel/redPacket/AccountPayRecordExport.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/5 16:36
+ */
+@Data
+public class AccountPayRecordExport {
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "订单编号", index = 0)
+    private String orderId;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值金额", index = 1)
+    private String amount;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值方式", index = 2)
+    private String isOffline;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "下单时间", index = 3)
+    private String createDate;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值方式", index = 4)
+    private String tradingStatus;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "支付时间", index = 5)
+    private String payDate;
+}

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

@@ -0,0 +1,38 @@
+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/5 16:36
+ */
+@Data
+public class AccountRefundRecordExport {
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "订单编号", index = 0)
+    private String orderId;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款金额", index = 1)
+    private String amount;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款创建时间", index = 2)
+    private String createDate;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款状态", index = 3)
+    private String tradingStatus;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "驳回原因", index = 4)
+    private String auditResult;
+}

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/TaOrgAccountController.java

@@ -21,8 +21,8 @@ import javax.servlet.http.HttpServletRequest;
 
 /**
  * <p>
-    * 系统账户表  前端控制器
-    * </p>
+ * 系统账户表  前端控制器
+ * </p>
  *
  * @author fxf
  * @since 2020-06-03
@@ -42,27 +42,28 @@ public class TaOrgAccountController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/api/taOrgAccount",method= RequestMethod.GET)
-    public ResponseBean taOrgAccountList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                         @RequestParam(value ="miniAppName", required = false) String miniAppName){
+    @RequestMapping(value = "/api/taOrgAccount", method = RequestMethod.GET)
+    public ResponseBean taOrgAccountList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "miniAppName", required = false) String miniAppName) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaOrgAccount> pg = new Page<>(pageNum, pageSize);
+            IPage<TaOrgAccount> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaOrgAccount> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(!StringUtils.isEmpty(miniAppName), "miniapp_name", miniAppName);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaOrgAccount> result = iTaOrgAccountService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgAccountList -=- {}",e.toString());
+            logger.error("taOrgAccountList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -70,21 +71,22 @@ public class TaOrgAccountController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taOrgAccount 实体对象
      * @return
      */
-    @RequestMapping(value="/api/taOrgAccount",method= RequestMethod.POST)
-    public ResponseBean taOrgAccountAdd(@RequestBody TaOrgAccount taOrgAccount){
+    @RequestMapping(value = "/api/taOrgAccount", method = RequestMethod.POST)
+    public ResponseBean taOrgAccountAdd(@RequestBody TaOrgAccount taOrgAccount) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaOrgAccountService.save(taOrgAccount)){
+            if (iTaOrgAccountService.save(taOrgAccount)) {
                 responseBean.addSuccess(taOrgAccount);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgAccountAdd -=- {}",e.toString());
+            logger.error("taOrgAccountAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -92,21 +94,22 @@ public class TaOrgAccountController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/api/taOrgAccount/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taOrgAccountDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/api/taOrgAccount/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taOrgAccountDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaOrgAccountService.removeById(id)){
+            if (iTaOrgAccountService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgAccountDelete -=- {}",e.toString());
+            logger.error("taOrgAccountDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -114,23 +117,24 @@ public class TaOrgAccountController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id           实体ID
      * @param taOrgAccount 实体对象
      * @return
      */
-    @RequestMapping(value="/api/taOrgAccount/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/api/taOrgAccount/{id}", method = RequestMethod.PUT)
     public ResponseBean taOrgAccountUpdate(@PathVariable Integer id,
-                                        @RequestBody TaOrgAccount taOrgAccount){
+                                           @RequestBody TaOrgAccount taOrgAccount) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaOrgAccountService.updateById(taOrgAccount)){
+            if (iTaOrgAccountService.updateById(taOrgAccount)) {
                 responseBean.addSuccess(taOrgAccount);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgAccountUpdate -=- {}",e.toString());
+            logger.error("taOrgAccountUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -138,16 +142,17 @@ public class TaOrgAccountController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/channel/taOrgAccount/{id}",method= RequestMethod.GET)
-    public ResponseBean taOrgAccountGet(@PathVariable Integer id){
+    @RequestMapping(value = "/channel/taOrgAccount/{id}", method = RequestMethod.GET)
+    public ResponseBean taOrgAccountGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaOrgAccountService.getOrgAccountById(id));
         }catch (Exception e){
             e.printStackTrace();
-            logger.error("taOrgAccountDelete -=- {}",e.toString());
+            logger.error("taOrgAccountDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -155,19 +160,20 @@ public class TaOrgAccountController extends BaseController {
 
     /**
      * 系统账户充值
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/channel/taOrgAccount/recharge/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/channel/taOrgAccount/recharge/{id}", method = RequestMethod.PUT)
     public ResponseBean taOrgAccountRecharge(@PathVariable String id, @RequestBody TaOrgAccount taOrgAccount,
-                                                    HttpServletRequest request){
+                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             Integer orgId = getOrgId(request);
             Integer userId = getUserId(request);
             iTaOrgAccountService.rechargeAccount(id, taOrgAccount, 26, 2149);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgAccountRecharge -=- {}",e.toString());
+            logger.error("taOrgAccountRecharge -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -175,22 +181,23 @@ public class TaOrgAccountController extends BaseController {
 
     /**
      * 系统账户退款
+     *
      * @param id
      * @param taOrgAccount
      * @param request
      * @return
      */
-    @RequestMapping(value = "/channel/taOrgAccount/refund/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/channel/taOrgAccount/refund/{id}", method = RequestMethod.PUT)
     public ResponseBean taOrgAccountRefund(@PathVariable String id, @RequestBody TaOrgAccount taOrgAccount,
-                                           HttpServletRequest request){
+                                           HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             Integer orgId = getOrgId(request);
             Integer userId = getUserId(request);
             responseBean = iTaOrgAccountService.refundAccount(id, taOrgAccount, 26, 2149);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgAccountRefund -=- {}",e.toString());
+            logger.error("taOrgAccountRefund -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -198,21 +205,22 @@ public class TaOrgAccountController extends BaseController {
 
     /**
      * 订单退款
+     *
      * @param id
      * @param refundApplication
      * @param request
      * @return
      */
-    @RequestMapping(value = "/channel/taOrgOrder/refund/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/channel/taOrgOrder/refund/{id}", method = RequestMethod.PUT)
     public ResponseBean taOrgOrderRefund(@PathVariable String id, @RequestBody TaOrgRefundApplication refundApplication,
-                                           HttpServletRequest request){
+                                         HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             Integer userId = getUserId(request);
-            responseBean = iTaOrgOrderService.refundOrder(id, refundApplication,  2149);
-        }catch (Exception e){
+            responseBean = iTaOrgOrderService.refundOrder(id, refundApplication, 2149);
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgAccountRefund -=- {}",e.toString());
+            logger.error("taOrgAccountRefund -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -220,6 +228,7 @@ public class TaOrgAccountController extends BaseController {
 
     /**
      * 订单驳回
+     *
      * @param id
      * @param refundApplication
      * @param request
@@ -227,14 +236,33 @@ public class TaOrgAccountController extends BaseController {
      */
     @RequestMapping(value = "/channel/taOrgOrder/reject/{id}")
     public ResponseBean taOrgOrderReject(@PathVariable String id, @RequestBody TaOrgRefundApplication refundApplication,
-                                         HttpServletRequest request){
+                                         HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             Integer userId = getUserId(request);
-            responseBean = iTaOrgOrderService.rejectOrder(id, refundApplication,  2149);
-        }catch (Exception e){
+            responseBean = iTaOrgOrderService.rejectOrder(id, refundApplication, 2149);
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgAccountRefund -=- {}",e.toString());
+            logger.error("taOrgAccountRefund -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 获取账户资金信息
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgAccount/get", method = RequestMethod.GET)
+    public ResponseBean getOrgAccountInfoByOrgId(HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgAccountService.getOrgAccountInfoByOrgId(getOrgId(request));
+        } catch (Exception e) {
+            logger.error("getOrgAccountInfo -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -242,6 +270,7 @@ public class TaOrgAccountController extends BaseController {
 
     /**
      * 微信统一下单接口
+     *
      * @param taOrgOrder
      * @param request
      * @return

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

@@ -2,9 +2,13 @@ package com.huiju.estateagents.redpack.controller;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson.JSON;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,8 +33,8 @@ import com.huiju.estateagents.service.ITaPersonService;
 
 /**
  * <p>
-    * 组织订单表  前端控制器
-    * </p>
+ * 组织订单表  前端控制器
+ * </p>
  *
  * @author fxf
  * @since 2020-06-03
@@ -50,31 +54,32 @@ public class TaOrgOrderController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/channel/taOrgOrder",method= RequestMethod.GET)
-    public ResponseBean taOrgOrderList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                       @RequestParam( value = "orderType", required = false) String orderType,
-                                       @RequestParam( value = "orgId", required = false) Integer orgId,
-                                       @RequestParam( value = "tradeNo", required = false) String tradeNo,
-                                       @RequestParam( value = "isOffline", required = false) Integer isOffline,
-                                       @RequestParam( value = "tradingStatus", required = false) String tradingStatus,
-                                       @RequestParam( value = "receivePhone", required = false) String receivePhone,
-                                       @RequestParam( value = "itemType", required = false) String itemType,
+    @RequestMapping(value = "/channel/taOrgOrder", method = RequestMethod.GET)
+    public ResponseBean taOrgOrderList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "orderType", required = false) String orderType,
+                                       @RequestParam(value = "orgId", required = false) Integer orgId,
+                                       @RequestParam(value = "tradeNo", required = false) String tradeNo,
+                                       @RequestParam(value = "isOffline", required = false) Integer isOffline,
+                                       @RequestParam(value = "tradingStatus", required = false) String tradingStatus,
+                                       @RequestParam(value = "receivePhone", required = false) String receivePhone,
+                                       @RequestParam(value = "itemType", required = false) String itemType,
                                        @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
-                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate){
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
+            IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
             IPage<TaOrgOrder> result = iTaOrgOrderService.listByCondition(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, receivePhone, itemType, startDate, endDate);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgOrderList -=- {}",e.toString());
+            logger.error("taOrgOrderList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -82,21 +87,22 @@ public class TaOrgOrderController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taOrgOrder 实体对象
      * @return
      */
-    @RequestMapping(value="/taOrgOrder",method= RequestMethod.POST)
-    public ResponseBean taOrgOrderAdd(@RequestBody TaOrgOrder taOrgOrder){
+    @RequestMapping(value = "/taOrgOrder", method = RequestMethod.POST)
+    public ResponseBean taOrgOrderAdd(@RequestBody TaOrgOrder taOrgOrder) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaOrgOrderService.save(taOrgOrder)){
+            if (iTaOrgOrderService.save(taOrgOrder)) {
                 responseBean.addSuccess(taOrgOrder);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgOrderAdd -=- {}",e.toString());
+            logger.error("taOrgOrderAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -104,21 +110,22 @@ public class TaOrgOrderController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taOrgOrder/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taOrgOrderDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taOrgOrder/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taOrgOrderDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaOrgOrderService.removeById(id)){
+            if (iTaOrgOrderService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgOrderDelete -=- {}",e.toString());
+            logger.error("taOrgOrderDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -126,23 +133,24 @@ public class TaOrgOrderController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id         实体ID
      * @param taOrgOrder 实体对象
      * @return
      */
-    @RequestMapping(value="/taOrgOrder/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/taOrgOrder/{id}", method = RequestMethod.PUT)
     public ResponseBean taOrgOrderUpdate(@PathVariable Integer id,
-                                        @RequestBody TaOrgOrder taOrgOrder){
+                                         @RequestBody TaOrgOrder taOrgOrder) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaOrgOrderService.updateById(taOrgOrder)){
+            if (iTaOrgOrderService.updateById(taOrgOrder)) {
                 responseBean.addSuccess(taOrgOrder);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgOrderUpdate -=- {}",e.toString());
+            logger.error("taOrgOrderUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -150,16 +158,17 @@ public class TaOrgOrderController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taOrgOrder/{id}",method= RequestMethod.GET)
-    public ResponseBean taOrgOrderGet(@PathVariable Integer id){
+    @RequestMapping(value = "/taOrgOrder/{id}", method = RequestMethod.GET)
+    public ResponseBean taOrgOrderGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaOrgOrderService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgOrderDelete -=- {}",e.toString());
+            logger.error("taOrgOrderDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -167,21 +176,193 @@ public class TaOrgOrderController extends BaseController {
 
     /**
      * 查询接收人信息
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/channel/receiveInfo/{id}",method= RequestMethod.GET)
-    public ResponseBean receiveInfoGet(@PathVariable String id, HttpServletRequest request){
+    @RequestMapping(value = "/channel/receiveInfo/{id}", method = RequestMethod.GET)
+    public ResponseBean receiveInfoGet(@PathVariable String id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
             taPersonQueryWrapper.eq("phone", id);
             taPersonQueryWrapper.eq("org_id", getOrgId(request));
             responseBean.addSuccess(iTaPersonService.getOne(taPersonQueryWrapper));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("receiveInfoGet -=- {}",e.toString());
+            logger.error("receiveInfoGet -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
+
+    /**
+     * 创建充值订单
+     *
+     * @param amount
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/cz/saveOrder", method = RequestMethod.PUT)
+    public ResponseBean saveCzOrder(@RequestParam(value = "amount") Double amount, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.saveCzOrder(amount, getOrgId(request), getUserId(request), request.getRemoteAddr());
+        } catch (Exception e) {
+            logger.error("saveCzOrder -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 创建退款订单
+     *
+     * @param amount
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/refund/saveOrder", method = RequestMethod.PUT)
+    public ResponseBean saveRefundOrder(@RequestParam(value = "amount") Double amount, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.saveRefundOrder(amount, getOrgId(request), getUserId(request));
+        } catch (Exception e) {
+            logger.error("refundOrder -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取充值订单列表
+     *
+     * @param pageNum       页码
+     * @param pageSize      分页大小
+     * @param payStartTime  支付开始时间
+     * @param payEndTime    支付结束时间
+     * @param orderId       订单编号
+     * @param tradeNo       交易号
+     * @param wxOrderId     微信订单编号
+     * @param isOffline     是否线下订单，true是，false否
+     * @param tradingStatus
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/cz/list", method = RequestMethod.GET)
+    public ResponseBean listCzOrderByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                               @RequestParam(value = "payStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate payStartTime,
+                                               @RequestParam(value = "payEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate payEndTime,
+                                               String orderId,
+                                               String tradeNo,
+                                               String wxOrderId,
+                                               Boolean isOffline,
+                                               String tradingStatus,
+                                               HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.listCzOrderByCondition(pageNum, pageSize, payStartTime, payEndTime, orderId, tradeNo, wxOrderId, isOffline, tradingStatus, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("refundOrder -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 导出充值订单列表
+     *
+     * @param payStartTime  支付开始时间
+     * @param payEndTime    支付结束时间
+     * @param orderId       订单编号
+     * @param tradeNo       交易号
+     * @param wxOrderId     微信订单编号
+     * @param isOffline     是否线下订单，true是，false否
+     * @param tradingStatus
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/cz/exportList", method = RequestMethod.GET)
+    public void exportCzOrderByCondition(@RequestParam(value = "payStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate payStartTime,
+                                         @RequestParam(value = "payEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate payEndTime,
+                                         String orderId,
+                                         String tradeNo,
+                                         String wxOrderId,
+                                         Boolean isOffline,
+                                         String tradingStatus,
+                                         HttpServletRequest request,
+                                         HttpServletResponse response) throws Exception {
+        try {
+            iTaOrgOrderService.exportCzOrderByCondition(payStartTime, payEndTime, orderId, tradeNo, wxOrderId, isOffline, tradingStatus, getOrgId(request), response);
+        } catch (Exception e) {
+            logger.error("exportCzOrderByCondition 异常：", 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));
+        }
+    }
+
+    /**
+     * 获取退款订单列表
+     *
+     * @param pageNum         页码
+     * @param pageSize        分页大小
+     * @param refundStartTime 退款开始时间
+     * @param refundEndTime   退款结束时间
+     * @param orderId         订单编号
+     * @param auditStatus
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/refund/list", method = RequestMethod.GET)
+    public ResponseBean listRefundOrderByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   @RequestParam(value = "refundStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate refundStartTime,
+                                                   @RequestParam(value = "refundEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate refundEndTime,
+                                                   String orderId,
+                                                   String auditStatus,
+                                                   HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.listRefundOrderByCondition(pageNum, pageSize, refundStartTime, refundEndTime, orderId, auditStatus, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("refundOrder -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 导出退款订单列表
+     *
+     * @param refundStartTime 退款开始时间
+     * @param refundEndTime   退款结束时间
+     * @param orderId         订单编号
+     * @param auditStatus     checking待审核，agree同意，unAgree 不同意
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/refund/exportList", method = RequestMethod.GET)
+    public void exportRefundOrderByCondition(@RequestParam(value = "refundStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate refundStartTime,
+                                             @RequestParam(value = "refundEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate refundEndTime,
+                                             String orderId,
+                                             String auditStatus,
+                                             HttpServletRequest request,
+                                             HttpServletResponse response) throws Exception {
+        try {
+            iTaOrgOrderService.exportRefundOrderByCondition(refundStartTime, refundEndTime, orderId, auditStatus, 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/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,90 @@ 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 = "/admin/redPacket/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 = "/admin/redPacket/exportRedPacketRankingList", method = RequestMethod.GET)
+    public void exportRedPacketRankingList(String activityId,
+                                           String phone,
+                                           HttpServletRequest request,
+                                           HttpServletResponse response) throws Exception {
+        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/controller/TaRedPacketHistoryController.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-06-03
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaRedPacketHistoryController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaRedPacketHistoryController.class);
@@ -36,9 +36,10 @@ public class TaRedPacketHistoryController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taRedPacketHistory",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/redPacket/history/list",method= RequestMethod.GET)
     public ResponseBean taRedPacketHistoryList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                               String phone){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件

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

@@ -97,6 +97,12 @@ public class TaOrgAccount implements Serializable {
     @TableField(exist = false)
     private Integer refundAmount;
 
+    /**
+     * 退款冻结金额
+     */
+    @TableField(exist = false)
+    private Integer refundBlockedAmount;
+
     /**
      * 代理商名称
      */

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

@@ -102,11 +102,34 @@ public class TaOrgOrder implements Serializable {
     private String miniAppName;
 
     @TableField(exist = false)
-    private List<String> certificateList;
+    private List<TaOrgAccountCertificate> certificateList;
 
     @TableField(exist = false)
     private String auditStatus;
 
+    @TableField(exist = false)
+    private String auditResult;
+
     @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

@@ -1,7 +1,10 @@
 package com.huiju.estateagents.redpack.mapper;
 
 import java.time.LocalDate;
+import java.util.List;
 
+import com.huiju.estateagents.excel.redPacket.AccountPayRecordExport;
+import com.huiju.estateagents.excel.redPacket.AccountRefundRecordExport;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,6 +25,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
 
     /**
      * 充值退款订单
+     *
      * @param pg
      * @param orderType
      * @return
@@ -37,6 +41,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
 
     /**
      * 消费订单
+     *
      * @param pg
      * @param orderType
      * @param orgId
@@ -52,10 +57,112 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                          @Param("startDate") LocalDate startDate,
                                          @Param("endDate") LocalDate endDate);
 
+    /**
+     * 获取充值订单列表
+     *
+     * @param page
+     * @param payStartTime
+     * @param payEndTime
+     * @param orderId
+     * @param tradeNo
+     * @param wxOrderId
+     * @param isOffline
+     * @param tradingStatus
+     * @param orgId
+     * @return
+     */
+    IPage<TaOrgOrder> listCzOrderByCondition(IPage<TaOrgOrder> page,
+                                             @Param("payStartTime") LocalDate payStartTime,
+                                             @Param("payEndTime") LocalDate payEndTime,
+                                             @Param("orderId") String orderId,
+                                             @Param("tradeNo") String tradeNo,
+                                             @Param("wxOrderId") String wxOrderId,
+                                             @Param("isOffline") Boolean isOffline,
+                                             @Param("tradingStatus") String tradingStatus,
+                                             @Param("orgId") Integer orgId);
+
+    /**
+     * 导出充值订单列表
+     *
+     * @param payStartTime
+     * @param payEndTime
+     * @param orderId
+     * @param tradeNo
+     * @param wxOrderId
+     * @param isOffline
+     * @param tradingStatus
+     * @param orgId
+     * @return
+     */
+    List<AccountPayRecordExport> exportCzOrderByCondition(@Param("payStartTime") LocalDate payStartTime,
+                                                          @Param("payEndTime") LocalDate payEndTime,
+                                                          @Param("orderId") String orderId,
+                                                          @Param("tradeNo") String tradeNo,
+                                                          @Param("wxOrderId") String wxOrderId,
+                                                          @Param("isOffline") Boolean isOffline,
+                                                          @Param("tradingStatus") String tradingStatus,
+                                                          @Param("orgId") Integer orgId);
+
+    /**
+     * 获取退款订单列表
+     *
+     * @param page
+     * @param refundStartTime
+     * @param refundEndTime
+     * @param orderId
+     * @param auditStatus
+     * @param orgId
+     * @return
+     */
+    IPage<TaOrgOrder> listRefundOrderByCondition(IPage<TaOrgOrder> page,
+                                                 @Param("refundStartTime") LocalDate refundStartTime,
+                                                 @Param("refundEndTime") LocalDate refundEndTime,
+                                                 @Param("orderId") String orderId,
+                                                 @Param("auditStatus") String auditStatus,
+                                                 @Param("orgId") Integer orgId);
+
+    /**
+     * 导出退款订单列表
+     *
+     * @param refundStartTime
+     * @param refundEndTime
+     * @param orderId
+     * @param auditStatus
+     * @param orgId
+     * @return
+     */
+    List<AccountRefundRecordExport> exportRefundOrderByCondition(@Param("refundStartTime") LocalDate refundStartTime,
+                                                                 @Param("refundEndTime") LocalDate refundEndTime,
+                                                                 @Param("orderId") String orderId,
+                                                                 @Param("auditStatus") String auditStatus,
+                                                                 @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/TaOrgRefundApplicationMapper.java

@@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,4 +17,13 @@ import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
 @Mapper
 public interface TaOrgRefundApplicationMapper extends BaseMapper<TaOrgRefundApplication> {
 
+    /**
+     * 计算退款冻结金额
+     *
+     * @param orgId
+     * @return
+     */
+    Integer countRefundBlockedAmount(@Param("orgId") Integer orgId);
+
+
 }

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

@@ -1,8 +1,10 @@
 package com.huiju.estateagents.redpack.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.redpack.entity.TaRedPacketHistory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 /**
@@ -17,4 +19,6 @@ import org.springframework.stereotype.Component;
 @Component
 public interface TaRedPacketHistoryMapper extends BaseMapper<TaRedPacketHistory> {
 
+    IPage<TaRedPacketHistory> listHistoryByCondition(IPage<TaRedPacketHistory> page,
+                                                     @Param("activityId") String activityId);
 }

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/ITaOrgAccountService.java

@@ -38,4 +38,12 @@ public interface ITaOrgAccountService extends IService<TaOrgAccount> {
      * @return
      */
     ResponseBean getOrgAccountById(Integer orgId);
+
+    /**
+     * 根据orgId获取账户信息
+     *
+     * @param orgId
+     * @return
+     */
+    ResponseBean getOrgAccountInfoByOrgId(Integer orgId);
 }

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

@@ -3,10 +3,13 @@ package com.huiju.estateagents.redpack.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.excel.redPacket.AccountPayRecordExport;
 import com.huiju.estateagents.redpack.entity.TaOrgOrder;
 import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
 
+import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * <p>
@@ -19,6 +22,7 @@ import java.time.LocalDate;
 public interface ITaOrgOrderService extends IService<TaOrgOrder> {
     /**
      * 订单退款
+     *
      * @param id
      * @param refundApplication
      * @param userId
@@ -29,6 +33,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
 
     /**
      * 订单驳回
+     *
      * @param id
      * @param refundApplication
      * @param userId
@@ -38,6 +43,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
 
     /**
      * 订单列表
+     *
      * @param pg
      * @param orderType
      * @return
@@ -46,9 +52,103 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
 
     /**
      * 微信支付
+     *
      * @param taOrgOrder
      * @param remoteAddr
      * @return
      */
     ResponseBean payUnifiedOrder(TaOrgOrder taOrgOrder, String remoteAddr) throws Exception;
+
+    /**
+     * 创建充值订单
+     *
+     * @param amount
+     * @param orgId
+     * @param userId
+     * @return
+     */
+    ResponseBean saveCzOrder(Double amount, Integer orgId, Integer userId, String ip) throws Exception;
+
+    /**
+     * 创建退款订单
+     *
+     * @param amount
+     * @param orgId
+     * @param userId
+     * @return
+     */
+    ResponseBean saveRefundOrder(Double amount, Integer orgId, Integer userId);
+
+    /**
+     * 获取充值订单列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param payStartTime
+     * @param payEndTime
+     * @param orderId
+     * @param tradeNo
+     * @param wxOrderId
+     * @param isOffline
+     * @param tradingStatus
+     * @return
+     */
+    ResponseBean listCzOrderByCondition(Integer pageNum, Integer pageSize, LocalDate payStartTime, LocalDate payEndTime, String orderId, String tradeNo,
+                                        String wxOrderId, Boolean isOffline, String tradingStatus, Integer orgId);
+
+    /**
+     * 导出充值订单列表
+     *
+     * @param payStartTime
+     * @param payEndTime
+     * @param orderId
+     * @param tradeNo
+     * @param wxOrderId
+     * @param isOffline
+     * @param tradingStatus
+     * @return
+     */
+    void exportCzOrderByCondition(LocalDate payStartTime, LocalDate payEndTime, String orderId, String tradeNo, String wxOrderId,
+                                  Boolean isOffline, String tradingStatus, Integer orgId, HttpServletResponse response) throws Exception;
+
+    /**
+     * 获取退款订单列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param refundStartTime
+     * @param refundEndTime
+     * @param orderId
+     * @param auditStatus
+     * @param orgId
+     * @return
+     */
+    ResponseBean listRefundOrderByCondition(Integer pageNum, Integer pageSize, LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, Integer orgId);
+
+    /**
+     * 导出退款订单列表
+     *
+     * @param refundStartTime
+     * @param refundEndTime
+     * @param orderId
+     * @param auditStatus
+     * @param orgId
+     * @param response
+     * @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/ITaRedPacketHistoryService.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.redpack.service;
 
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.redpack.entity.TaRedPacketHistory;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaRedPacketHistoryService extends IService<TaRedPacketHistory> {
 
+    ResponseBean listHistoryByCondition(Integer pageNum, Integer pageSize, String activityId);
+
 }

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/TaOrgAccountServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,10 +73,10 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
     private TaOrgRefundApplicationMapper taOrgRefundApplicationMapper;
 
     @Autowired
-    private TaOrgAccountBlockedMapper taOrgAccountBlockedMapper;
+    private TaUserMapper taUserMapper;
 
     @Autowired
-    private TaUserMapper taUserMapper;
+    private ITaOrgOrderService iTaOrgOrderService;
 
     @Autowired
     private TaContactMapper taContactMapper;
@@ -93,7 +94,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
 
         //更新系统账户充值金额
         TaOrgAccount rechargeAccount = assembleRechargeAccount(accountId, taOrgAccount);
-        synchronized (this){
+        synchronized (this) {
             taOrgAccountMapper.updateById(rechargeAccount);
         }
 
@@ -110,16 +111,16 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         int taOrgAccountDetailedListInsertResult = taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
 
         //插入凭证记录
-        if (CollectionUtils.isNotEmpty(taOrgAccount.getCertificateList())){
+        if (CollectionUtils.isNotEmpty(taOrgAccount.getCertificateList())) {
             List<TaOrgAccountCertificate> taOrgAccountCertificateList = assembleAccountCertificate(orgId, taOrgAccount, taOrgAccountDetailedList.getSerialNo(), taOrgOrder.getOrderId(), userId, CommConstant.ITEM_TYPE_RECHARGE);
             taOrgAccountCertificateList.forEach(e -> {
                 taOrgAccountCertificateMapper.insert(e);
             });
         }
 
-        if (    taOrgOrderInsertResult < 1 ||
+        if (taOrgOrderInsertResult < 1 ||
                 taOrgOrderDetailInsertResult < 1 ||
-                taOrgAccountDetailedListInsertResult < 1){
+                taOrgAccountDetailedListInsertResult < 1) {
             responseBean.addError("充值失败");
             return responseBean;
         }
@@ -139,7 +140,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
 
         //更新系统账户余额
         TaOrgAccount selectOneAccount = selectTaOrgAccountById(accountId);
-        if (selectOneAccount.getAvailableBalance() < taOrgAccount.getRefundAmount()){
+        if (selectOneAccount.getAvailableBalance() < taOrgAccount.getRefundAmount()) {
             responseBean.addError("退款额不能大于余额");
             return responseBean;
         }
@@ -159,7 +160,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         int taOrgAccountDetailedListInsertResult = taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
 
         //插入凭证记录
-        if (CollectionUtils.isNotEmpty(taOrgAccount.getCertificateList())){
+        if (CollectionUtils.isNotEmpty(taOrgAccount.getCertificateList())) {
             List<TaOrgAccountCertificate> taOrgAccountCertificateList = assembleAccountCertificate(orgId, taOrgAccount, taOrgAccountDetailedList.getSerialNo(), taOrgOrder.getOrderId(), userId, CommConstant.ITEM_TYPE_REFUND);
             taOrgAccountCertificateList.forEach(e -> {
                 taOrgAccountCertificateMapper.insert(e);
@@ -169,7 +170,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         if (taOrgOrderInsertResult < 1 ||
                 taOrgOrderInsertResult < 1 ||
                 taOrgOrderDetailInsertResult < 1 ||
-                taOrgAccountDetailedListInsertResult < 1){
+                taOrgAccountDetailedListInsertResult < 1) {
             responseBean.addError("退费失败");
             return responseBean;
         }
@@ -201,13 +202,33 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         return responseBean;
     }
 
+    @Override
+    public ResponseBean getOrgAccountInfoByOrgId(Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        QueryWrapper<TaOrgAccount> orgAccountQueryWrapper = new QueryWrapper<>();
+        orgAccountQueryWrapper.eq("org_id", orgId);
+        orgAccountQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        TaOrgAccount orgAccount = getOne(orgAccountQueryWrapper);
+        if (orgAccount == null) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 计算退款冻结金额
+        orgAccount.setRefundBlockedAmount(taOrgRefundApplicationMapper.countRefundBlockedAmount(orgId));
+        responseBean.addSuccess(orgAccount);
+        return responseBean;
+    }
+
     /**
      * 构造充值账户
+     *
      * @param accountId
      * @param taOrgAccount
      * @return
      */
-    private TaOrgAccount assembleRechargeAccount(String accountId, TaOrgAccount taOrgAccount){
+    private TaOrgAccount assembleRechargeAccount(String accountId, TaOrgAccount taOrgAccount) {
         TaOrgAccount selectOneAccount = selectTaOrgAccountById(accountId);
 
         TaOrgAccount rechargeAccount = new TaOrgAccount();
@@ -221,6 +242,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
 
     /**
      * 构造交易凭证信息
+     *
      * @param orgId
      * @param taOrgAccount
      * @param accountSerialNo
@@ -228,7 +250,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
      * @param userId
      * @return
      */
-    public List<TaOrgAccountCertificate> assembleAccountCertificate(Integer orgId, TaOrgAccount taOrgAccount, Integer accountSerialNo, String orderId, Integer userId, String consumeType){
+    public List<TaOrgAccountCertificate> assembleAccountCertificate(Integer orgId, TaOrgAccount taOrgAccount, Integer accountSerialNo, String orderId, Integer userId, String consumeType) {
         TaUser taUser = selectUserById(userId);
         List<TaOrgAccountCertificate> taOrgAccountCertificateList = new ArrayList<>();
 
@@ -252,12 +274,13 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
 
     /**
      * 构造订单
+     *
      * @param orgId
      * @param amount
      * @param userId
      * @return
      */
-    private TaOrgOrder assembleTaOrgOrder(Integer orgId, Integer amount, Integer userId, String consumeType){
+    private TaOrgOrder assembleTaOrgOrder(Integer orgId, Integer amount, Integer userId, String consumeType) {
 
         TaUser taUser = selectUserById(userId);
         TaOrgOrder taOrgOrder = new TaOrgOrder();
@@ -277,12 +300,13 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
 
     /**
      * 构造交订单详情信息
+     *
      * @param orderId
      * @param orgId
      * @param amount
      * @return
      */
-    private TaOrgOrderDetail assembleTaOrgOrderDetail(String orderId, Integer orgId, Integer amount, String consumeType){
+    private TaOrgOrderDetail assembleTaOrgOrderDetail(String orderId, Integer orgId, Integer amount, String consumeType) {
         TaOrgOrderDetail taOrgOrderDetail = new TaOrgOrderDetail();
 
         taOrgOrderDetail.setOrderId(orderId);
@@ -295,13 +319,14 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
 
     /**
      * 构造消费流水记录
+     *
      * @param orgId
      * @param taOrgAccount
      * @param orderId
      * @param userId
      * @return
      */
-    private TaOrgAccountDetailedList assembleAccountDetailList(Integer orgId, TaOrgAccount taOrgAccount, String orderId, Integer userId, String consumeType){
+    private TaOrgAccountDetailedList assembleAccountDetailList(Integer orgId, TaOrgAccount taOrgAccount, String orderId, Integer userId, String consumeType) {
 
         TaUser taUser = selectUserById(userId);
         TaOrgAccountDetailedList taOrgAccountDetailed = new TaOrgAccountDetailedList();
@@ -320,11 +345,12 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
 
     /**
      * 构造退费账户
+     *
      * @param accountId
      * @param taOrgAccount
      * @return
      */
-    private TaOrgAccount assembleRefundAccount(String accountId, TaOrgAccount taOrgAccount){
+    private TaOrgAccount assembleRefundAccount(String accountId, TaOrgAccount taOrgAccount) {
         TaOrgAccount selectOneAccount = selectTaOrgAccountById(accountId);
 
         TaOrgAccount refundAccount = new TaOrgAccount();
@@ -337,14 +363,14 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         return refundAccount;
     }
 
-    public TaOrgAccount selectTaOrgAccountById(String accountId){
+    public TaOrgAccount selectTaOrgAccountById(String accountId) {
         QueryWrapper<TaOrgAccount> selectOneQuery = new QueryWrapper<>();
         selectOneQuery.eq("account_id", accountId);
         TaOrgAccount selectOneAccount = taOrgAccountMapper.selectOne(selectOneQuery);
         return selectOneAccount;
     }
 
-    public TaUser selectUserById(Integer userId){
+    public TaUser selectUserById(Integer userId) {
         //获取操作人
         QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
         taUserQueryWrapper.eq("user_id", userId);

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

@@ -1,7 +1,9 @@
 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.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.center.taUser.entity.TaUser;
@@ -12,6 +14,8 @@ import com.huiju.estateagents.common.wxpay.WXPay;
 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.AccountPayRecordExport;
+import com.huiju.estateagents.excel.redPacket.AccountRefundRecordExport;
 import com.huiju.estateagents.mapper.TaWxPayConfigMapper;
 import com.huiju.estateagents.redpack.entity.*;
 import com.huiju.estateagents.redpack.mapper.*;
@@ -23,10 +27,12 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -80,10 +86,10 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, LocalDate startDate, LocalDate endDate) {
         IPage<TaOrgOrder> result = null;
 
-        if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)){
+        if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
             result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate);
             return result;
-        } else if (CommConstant.ITEM_TYPE_REDPACKAGE.equals(orderType)){
+        } else if (CommConstant.ITEM_TYPE_REDPACKAGE.equals(orderType)) {
             result = taOrgOrderMapper.orderListByConsume(pg, orderType, orgId, tradeNo, tradingStatus, receivePhone, itemType, startDate, endDate);
             return result;
         } else {
@@ -124,42 +130,218 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         //终端IP
         data.put("spbill_create_ip", clientIp);
         //回调地址
-        data.put("notify_url", payNotify+CommConstant.ITEM_TYPE_RECHARGE);
+        data.put("notify_url", payNotify + CommConstant.ITEM_TYPE_RECHARGE);
         // 此处指定为APP支付
         data.put("trade_type", "NATIVE");
         Map<String, String> resp = wxpay.unifiedOrder(data);
         log.info("下单成功：{}", resp);
-        if (resp.get("result_code").equalsIgnoreCase(WXPayConstants.FAIL)){
+        if (resp.get("result_code").equalsIgnoreCase(WXPayConstants.FAIL)) {
             throw new Exception(resp.get("err_code_des"));
         }
 
         return ResponseBean.success(resp.get("code_url"));
     }
 
+    @Override
+    public ResponseBean saveCzOrder(Double amount, Integer orgId, Integer userId, String ip) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 获取下单人名称
+        TaUser taUser = taUserMapper.selectById(userId);
+        if (taUser == null) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 1.创建订单主表信息
+        TaOrgOrder taOrgOrder = new TaOrgOrder();
+        taOrgOrder.setOrgId(orgId);
+        taOrgOrder.setTradeNo(CommonUtils.generateTradeNo(CommConstant.RECHARGE));
+        taOrgOrder.setAmount(CommonUtils.yuanToFen(amount));
+        taOrgOrder.setCreateDate(LocalDateTime.now());
+        taOrgOrder.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_PROCESSING);
+        taOrgOrder.setIsOffline(false);
+        taOrgOrder.setUserId(userId);
+        taOrgOrder.setUserName(taUser.getUserName());
+        if (taOrgOrderMapper.insert(taOrgOrder) < 1) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 2.创建订单详情表信息
+        TaOrgOrderDetail taOrgOrderDetail = new TaOrgOrderDetail();
+        taOrgOrderDetail.setOrderId(taOrgOrder.getOrderId());
+        taOrgOrderDetail.setOrgId(orgId);
+        taOrgOrderDetail.setItemType(CommConstant.ITEM_TYPE_RECHARGE);
+        taOrgOrderDetail.setAmount(CommonUtils.yuanToFen(amount));
+        taOrgOrderDetail.setUnitPrice(CommonUtils.yuanToFen(amount));
+        taOrgOrderDetail.setQuantity(1);
+        taOrgOrderDetail.setStatus(CommConstant.STATUS_NORMAL);
+        if (taOrgOrderDetailMapper.insert(taOrgOrderDetail) < 1) {
+            taOrgOrderMapper.deleteById(taOrgOrder.getOrderId());
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 3.请求微信接口获取支付二维码
+        return payUnifiedOrder(taOrgOrder, ip);
+    }
+
+    @Override
+    public ResponseBean saveRefundOrder(Double amount, Integer orgId, Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 获取下单人名称
+        TaUser taUser = taUserMapper.selectById(userId);
+        if (taUser == null) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 1.创建订单主表信息
+        TaOrgOrder taOrgOrder = new TaOrgOrder();
+        taOrgOrder.setOrgId(orgId);
+        taOrgOrder.setTradeNo(CommonUtils.generateTradeNo(CommConstant.REFUND));
+        taOrgOrder.setAmount(CommonUtils.yuanToFen(amount));
+        taOrgOrder.setCreateDate(LocalDateTime.now());
+        taOrgOrder.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_PROCESSING);
+        taOrgOrder.setIsOffline(false);
+        taOrgOrder.setUserId(userId);
+        taOrgOrder.setUserName(taUser.getUserName());
+        if (taOrgOrderMapper.insert(taOrgOrder) < 1) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 2.创建订单详情表信息
+        TaOrgOrderDetail taOrgOrderDetail = new TaOrgOrderDetail();
+        taOrgOrderDetail.setOrderId(taOrgOrder.getOrderId());
+        taOrgOrderDetail.setOrgId(orgId);
+        taOrgOrderDetail.setItemType(CommConstant.ITEM_TYPE_REFUND);
+        taOrgOrderDetail.setAmount(CommonUtils.yuanToFen(amount));
+        taOrgOrderDetail.setUnitPrice(CommonUtils.yuanToFen(amount));
+        taOrgOrderDetail.setQuantity(1);
+        taOrgOrderDetail.setStatus(CommConstant.STATUS_NORMAL);
+        if (taOrgOrderDetailMapper.insert(taOrgOrderDetail) < 1) {
+            taOrgOrderMapper.deleteById(taOrgOrder.getOrderId());
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 3.创建账户腿狂申请表信息
+        TaOrgRefundApplication taOrgRefundApplication = new TaOrgRefundApplication();
+        taOrgRefundApplication.setOrgId(orgId);
+        taOrgRefundApplication.setUserId(userId);
+        taOrgRefundApplication.setUserName(taUser.getUserName());
+        taOrgRefundApplication.setAmount(CommonUtils.yuanToFen(amount));
+        taOrgRefundApplication.setAuditStatus(CommConstant.CHECK_STATUS_CHECKING);
+        taOrgRefundApplication.setOrderId(taOrgOrder.getOrderId());
+        taOrgRefundApplication.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgRefundApplication.setCreateDate(LocalDateTime.now());
+        taOrgRefundApplication.setReason("线上申请退款");
+        if (taOrgRefundApplicationMapper.insert(taOrgRefundApplication) < 1) {
+            taOrgOrderMapper.deleteById(taOrgOrder.getOrderId());
+            taOrgOrderDetailMapper.deleteById(taOrgOrderDetail.getSerialNo());
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        responseBean.addSuccess("success");
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean listCzOrderByCondition(Integer pageNum, Integer pageSize, LocalDate payStartTime, LocalDate payEndTime,
+                                               String orderId, String tradeNo, String wxOrderId, Boolean isOffline, String tradingStatus, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
+        pg = taOrgOrderMapper.listCzOrderByCondition(pg, payStartTime, payEndTime, orderId, tradeNo, wxOrderId, isOffline, tradingStatus, orgId);
+        if (CollectionUtils.isNotEmpty(pg.getRecords())) {
+            pg.getRecords().stream().forEach(r -> {
+                QueryWrapper<TaOrgAccountCertificate> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("order_id", r.getOrderId());
+                queryWrapper.eq("org_id", orgId);
+                r.setCertificateList(taOrgAccountCertificateMapper.selectList(queryWrapper));
+            });
+        }
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
+
+    @Override
+    public void exportCzOrderByCondition(LocalDate payStartTime, LocalDate payEndTime, String orderId, String tradeNo,
+                                         String wxOrderId, Boolean isOffline, String tradingStatus, Integer orgId, HttpServletResponse response) throws Exception {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        List<AccountPayRecordExport> records = taOrgOrderMapper.exportCzOrderByCondition(payStartTime, payEndTime, orderId, tradeNo, wxOrderId, isOffline, tradingStatus, orgId);
+        String fileName = URLEncoder.encode("充值订单", "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        EasyExcel.write(response.getOutputStream(), AccountPayRecordExport.class).sheet("充值订单").doWrite(records);
+    }
+
+    @Override
+    public ResponseBean listRefundOrderByCondition(Integer pageNum, Integer pageSize, LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
+        pg = taOrgOrderMapper.listRefundOrderByCondition(pg, refundStartTime, refundEndTime, orderId, auditStatus, orgId);
+
+        if (CollectionUtils.isNotEmpty(pg.getRecords())) {
+            pg.getRecords().stream().forEach(r -> {
+                QueryWrapper<TaOrgAccountCertificate> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("order_id", r.getOrderId());
+                queryWrapper.eq("org_id", orgId);
+                r.setCertificateList(taOrgAccountCertificateMapper.selectList(queryWrapper));
+            });
+        }
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
+
+    @Override
+    public void exportRefundOrderByCondition(LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, Integer orgId, HttpServletResponse response) throws Exception {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        List<AccountRefundRecordExport> records = taOrgOrderMapper.exportRefundOrderByCondition(refundStartTime, refundEndTime, orderId, auditStatus, orgId);
+        String fileName = URLEncoder.encode("退款订单", "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        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;
+    }
+
     /**
      * 获取每个小程序独立的微信账户
+     *
      * @param orgId
      * @return
      */
     private WxConfig getWxConfig(Integer orgId) throws Exception {
         //根据orgId获取支付配置
         QueryWrapper<TaWxPayConfig> taWxPayConfigQueryWrapper = new QueryWrapper<>();
-        taWxPayConfigQueryWrapper.eq("org_id",orgId);
+        taWxPayConfigQueryWrapper.eq("org_id", orgId);
         TaWxPayConfig taWxPayConfig = taWxPayConfigMapper.selectOne(taWxPayConfigQueryWrapper);
-        if (null == taWxPayConfig){
+        if (null == taWxPayConfig) {
             throw new Exception("请先完善支付信息");
         }
-        log.info("正在配置orgId为{}的微信支付参数，商户号为{}",orgId,taWxPayConfig.getMchId());
+        log.info("正在配置orgId为{}的微信支付参数，商户号为{}", orgId, taWxPayConfig.getMchId());
         //把库里的值赋值给微信
         URL urlConet = new URL(taWxPayConfig.getApiPath());
-        HttpURLConnection con = (HttpURLConnection)urlConet.openConnection();
+        HttpURLConnection con = (HttpURLConnection) urlConet.openConnection();
         con.setRequestMethod("GET");
         con.setConnectTimeout(4 * 1000);
-        InputStream inStream = con .getInputStream();
+        InputStream inStream = con.getInputStream();
         ByteArrayOutputStream outStream = new ByteArrayOutputStream();
         byte[] buffer = new byte[2048];
         int len = 0;
-        while( (len=inStream.read(buffer)) != -1 ){
+        while ((len = inStream.read(buffer)) != -1) {
             outStream.write(buffer, 0, len);
         }
         inStream.close();
@@ -203,7 +385,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         int taOrgAccountBlockedUpdateResult = updateOrgAccountBlock(refundApplication);
 
         //插入凭证记录
-        if (CollectionUtils.isNotEmpty(refundApplication.getCertificateList())){
+        if (CollectionUtils.isNotEmpty(refundApplication.getCertificateList())) {
             List<TaOrgAccountCertificate> taOrgAccountCertificateList = assembleAccountCertificate(refundApplication.getOrgId(), taOrgAccount, taOrgAccountDetailedList.getSerialNo(), taOrgOrder.getOrderId(), userId, CommConstant.ITEM_TYPE_REFUND);
             taOrgAccountCertificateList.forEach(e -> {
                 taOrgAccountCertificateMapper.insert(e);
@@ -214,7 +396,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
                 taOrgOrderDetailInsertResult < 1 ||
                 taOrgAccountDetailedListInsertResult < 1 ||
                 taOrgRefundApplicationUpdateResult < 1 ||
-                taOrgAccountBlockedUpdateResult < 1){
+                taOrgAccountBlockedUpdateResult < 1) {
             responseBean.addError("订单退款失败");
             return responseBean;
         }
@@ -241,7 +423,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         int taOrgRefundApplicationUpdateResult = taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
 
         if (taOrgAccountBlockedUpdateResult < 1 ||
-                taOrgRefundApplicationUpdateResult < 1){
+                taOrgRefundApplicationUpdateResult < 1) {
             responseBean.addError("驳回失败");
             return responseBean;
         }
@@ -252,22 +434,23 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
     /**
      * 构造充值账户
+     *
      * @param orgId
      * @param refundApplication
      * @return
      */
-    private TaOrgAccount assembleRefundAccount(Integer orgId, TaOrgRefundApplication refundApplication, String operateType){
+    private TaOrgAccount assembleRefundAccount(Integer orgId, TaOrgRefundApplication refundApplication, String operateType) {
         TaOrgAccount selectOneAccount = selectTaOrgAccountById(orgId);
 
         TaOrgAccount rechargeAccount = new TaOrgAccount();
         rechargeAccount.setAccountId(selectOneAccount.getAccountId());
 
-        if (CommConstant.ITEM_TYPE_REFUND.equals(operateType)){
+        if (CommConstant.ITEM_TYPE_REFUND.equals(operateType)) {
             rechargeAccount.setRealBalance(selectOneAccount.getRealBalance() - refundApplication.getAmount());
             rechargeAccount.setTotalRefund(selectOneAccount.getTotalRefund() + refundApplication.getAmount());
         }
 
-        if (CommConstant.ITEM_TYPE_REJECT.equals(operateType)){
+        if (CommConstant.ITEM_TYPE_REJECT.equals(operateType)) {
             rechargeAccount.setAvailableBalance(refundApplication.getAmount());
         }
 
@@ -278,12 +461,13 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
     /**
      * 构造订单
+     *
      * @param orgId
      * @param amount
      * @param userId
      * @return
      */
-    private TaOrgOrder assembleTaOrgOrder(Integer orgId, Integer amount, Integer userId){
+    private TaOrgOrder assembleTaOrgOrder(Integer orgId, Integer amount, Integer userId) {
 
         TaUser taUser = selectUserById(userId);
         TaOrgOrder taOrgOrder = new TaOrgOrder();
@@ -303,12 +487,13 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
     /**
      * 构造交订单详情信息
+     *
      * @param orderId
      * @param orgId
      * @param amount
      * @return
      */
-    private TaOrgOrderDetail assembleTaOrgOrderDetail(String orderId, Integer orgId, Integer amount){
+    private TaOrgOrderDetail assembleTaOrgOrderDetail(String orderId, Integer orgId, Integer amount) {
         TaOrgOrderDetail taOrgOrderDetail = new TaOrgOrderDetail();
 
         taOrgOrderDetail.setOrderId(orderId);
@@ -321,11 +506,12 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
     /**
      * 构造消费流水记录
+     *
      * @param refundApplication
      * @param userId
      * @return
      */
-    private TaOrgAccountDetailedList assembleAccountDetailList(TaOrgRefundApplication refundApplication, Integer userId){
+    private TaOrgAccountDetailedList assembleAccountDetailList(TaOrgRefundApplication refundApplication, Integer userId) {
 
         TaUser taUser = selectUserById(userId);
         TaOrgAccount taOrgAccount = selectTaOrgAccountById(refundApplication.getOrgId());
@@ -346,6 +532,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
     /**
      * 构造交易凭证信息
+     *
      * @param orgId
      * @param taOrgAccount
      * @param accountSerialNo
@@ -353,7 +540,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
      * @param userId
      * @return
      */
-    public List<TaOrgAccountCertificate> assembleAccountCertificate(Integer orgId, TaOrgAccount taOrgAccount, Integer accountSerialNo, String orderId, Integer userId, String consumeType){
+    public List<TaOrgAccountCertificate> assembleAccountCertificate(Integer orgId, TaOrgAccount taOrgAccount, Integer accountSerialNo, String orderId, Integer userId, String consumeType) {
         TaUser taUser = selectUserById(userId);
         List<TaOrgAccountCertificate> taOrgAccountCertificateList = new ArrayList<>();
 
@@ -377,6 +564,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
     /**
      * 构造订单退款申请
+     *
      * @param userId
      * @return
      */
@@ -391,7 +579,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         return taOrgRefundApplication;
     }
 
-    private Integer updateOrgAccountBlock(TaOrgRefundApplication refundApplication){
+    private Integer updateOrgAccountBlock(TaOrgRefundApplication refundApplication) {
         //更新账户冻结记录
         TaOrgAccountBlocked taOrgAccountBlocked = new TaOrgAccountBlocked();
         taOrgAccountBlocked.setStatus(CommConstant.STATUS_UNACCALIMED);
@@ -400,7 +588,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         return taOrgAccountBlockedMapper.update(taOrgAccountBlocked, taOrgAccountBlockedQueryWrapper);
     }
 
-    public TaOrgAccount selectTaOrgAccountById(Integer orgId){
+    public TaOrgAccount selectTaOrgAccountById(Integer orgId) {
         QueryWrapper<TaOrgAccount> selectOneQuery = new QueryWrapper<>();
         selectOneQuery.eq("org_id", orgId);
         TaOrgAccount selectOneAccount = taOrgAccountMapper.selectOne(selectOneQuery);
@@ -409,10 +597,11 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
     /**
      * 获取操作人
+     *
      * @param userId
      * @return
      */
-    public TaUser selectUserById(Integer userId){
+    public TaUser selectUserById(Integer userId) {
         //获取操作人
         QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
         taUserQueryWrapper.eq("user_id", userId);

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

@@ -1,9 +1,11 @@
 package com.huiju.estateagents.redpack.service.impl;
 
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.redpack.entity.TaRedPacketHistory;
 import com.huiju.estateagents.redpack.mapper.TaRedPacketHistoryMapper;
 import com.huiju.estateagents.redpack.service.ITaRedPacketHistoryService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +19,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaRedPacketHistoryServiceImpl extends ServiceImpl<TaRedPacketHistoryMapper, TaRedPacketHistory> implements ITaRedPacketHistoryService {
 
+    @Autowired
+    private TaRedPacketHistoryMapper taRedPacketHistoryMapper;
+
+    @Override
+    public ResponseBean listHistoryByCondition(Integer pageNum, Integer pageSize, String activityId) {
+        ResponseBean responseBean = new ResponseBean();
+
+
+
+        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/java/com/huiju/estateagents/sample/controller/TaContactController.java

@@ -58,10 +58,10 @@ public class TaContactController extends BaseController {
             //使用分页插件
             IPage<TaContact> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaContact> queryWrapper = new QueryWrapper<>();
-            queryWrapper.like(!StringUtils.isEmpty(contactName),"contact_name", contactName);
-            queryWrapper.like(!StringUtils.isEmpty(telephone),"telephone", telephone);
-            queryWrapper.like(!StringUtils.isEmpty(phone),"phone", phone);
-            queryWrapper.like(!StringUtils.isEmpty(job),"job", job);
+            queryWrapper.like(!StringUtils.isEmpty(contactName), "contact_name", contactName);
+            queryWrapper.like(!StringUtils.isEmpty(telephone), "telephone", telephone);
+            queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
+            queryWrapper.like(!StringUtils.isEmpty(job), "job", job);
             queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("order_no", "create_date");
 
@@ -102,14 +102,13 @@ public class TaContactController extends BaseController {
 
     /**
      * 批量删除
-     *
      */
     @ResponseBody
     @RequestMapping(value = "/channel/taContact/batchDelete", method = RequestMethod.PUT)
     public ResponseBean batchDelete(@RequestBody List<TaContact> taContactList, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaContactService.batchDelete(taContactList,getSysUserId(request));
+            responseBean = iTaContactService.batchDelete(taContactList, getSysUserId(request));
             logger.info("TaContactController.batchDelete 返回结果：", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             e.printStackTrace();
@@ -164,34 +163,35 @@ public class TaContactController extends BaseController {
 
     /**
      * 联系人列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/channel/taContact",method= RequestMethod.GET)
-    public ResponseBean getContactList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                       @RequestParam(value ="contactName",required = false) String contactName,
-                                       @RequestParam(value ="telephone",required = false) String telephone,
-                                       @RequestParam(value ="phone",required = false) String phone,
-                                       @RequestParam(value ="job",required = false) String job){
+    @RequestMapping(value = "/channel/taContact", method = RequestMethod.GET)
+    public ResponseBean getContactList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "contactName", required = false) String contactName,
+                                       @RequestParam(value = "telephone", required = false) String telephone,
+                                       @RequestParam(value = "phone", required = false) String phone,
+                                       @RequestParam(value = "job", required = false) String job) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             IPage<TaContact> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaContact> queryWrapper = new QueryWrapper<>();
-            queryWrapper.like(!StringUtils.isEmpty(contactName),"contact_name",contactName);
-            queryWrapper.like(!StringUtils.isEmpty(telephone),"telephone",telephone);
-            queryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
-            queryWrapper.like(!StringUtils.isEmpty(job),"job",job);
+            queryWrapper.like(!StringUtils.isEmpty(contactName), "contact_name", contactName);
+            queryWrapper.like(!StringUtils.isEmpty(telephone), "telephone", telephone);
+            queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
+            queryWrapper.like(!StringUtils.isEmpty(job), "job", job);
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
-            queryWrapper.orderByDesc("order_no","create_date");
+            queryWrapper.orderByDesc("order_no", "create_date");
 
             IPage<TaContact> result = iTaContactService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactList -=- {}",e.toString());
+            logger.error("taContactList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -199,18 +199,57 @@ public class TaContactController extends BaseController {
 
     /**
      * 根据样例id查询联系人信息
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/admin/taContact/{id}",method= RequestMethod.GET)
+    @RequestMapping(value = "/admin/taContact/{id}", method = RequestMethod.GET)
     public ResponseBean taContactInfoBySampleId(@PathVariable String id,
-                                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                                @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaContactService.taContactInfoBySampleId(id, pageNum, pageSize));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactDelete -=- {}",e.toString());
+            logger.error("taContactDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 条件查询联系人列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param contactName
+     * @param telephone
+     * @param phone
+     * @param job
+     * @return
+     */
+    @RequestMapping(value = "/admin/listContactByCondition", method = RequestMethod.GET)
+    public ResponseBean listContactByConditionForAdmin(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                       String contactName, String telephone, String phone, String job, String contactType) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaContact> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaContact> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(contactName), "contact_name", contactName);
+            queryWrapper.like(!StringUtils.isEmpty(telephone), "telephone", telephone);
+            queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
+            queryWrapper.like(!StringUtils.isEmpty(job), "job", job);
+            queryWrapper.like(!StringUtils.isEmpty(contactType), "contact_type", contactType);
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("order_no", "create_date");
+
+            IPage<TaContact> result = iTaContactService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taContactList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -86,11 +86,177 @@
         GROUP BY t.order_id
     </select>
 
+    <select id="listCzOrderByCondition" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
+        SELECT
+          *
+        FROM
+          ta_org_order t
+        INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id
+          AND t2.item_type = 'recharge'
+        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 = " isOffline != null">
+                AND t.is_offline = #{isOffline}
+            </if>
+            <if test = " payStartTime != null ">
+                AND t.pay_date &gt;= #{payStartTime}
+            </if>
+            <if test = " payStartTime != null and">
+                AND t.pay_date &lt;= #{payStartTime}
+            </if>
+            <if test = " tradingStatus != null">
+                AND t.trading_status = #{tradingStatus}
+            </if>
+        ORDER BY
+        t.create_date DESC
+    </select>
+
+    <select id="exportCzOrderByCondition" resultType="com.huiju.estateagents.excel.redPacket.AccountPayRecordExport">
+        SELECT
+            t.order_id,
+            t.amount,
+            ( CASE t.is_offline WHEN TRUE THEN '运营手工充值' ELSE '业务线上充值' END ) isOffline,
+            t.create_date,
+            ( CASE t.trading_status WHEN 'success' THEN '已支付' WHEN 'processing' THEN '待支付' ELSE '已超时' END ) tradingStatus,
+            t.pay_date
+        FROM
+          ta_org_order t
+        INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id AND t2.item_type = 'recharge'
+        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 = " isOffline != null">
+                AND t.is_offline = #{isOffline}
+            </if>
+            <if test = " payStartTime != null ">
+                AND t.pay_date &gt;= #{payStartTime}
+            </if>
+            <if test = " payStartTime != null and">
+                AND t.pay_date &lt;= #{payStartTime}
+            </if>
+            <if test = " tradingStatus != null">
+                AND t.trading_status = #{tradingStatus}
+            </if>
+        ORDER BY
+          t.create_date DESC
+    </select>
+
+    <select id="listRefundOrderByCondition" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
+        SELECT
+            t.*,
+            t3.audit_status,
+            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
+        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=" auditStatus != null and auditStatus != ''">
+                AND t3.audit_status = #{auditStatus}
+            </if>
+            <if test=" refundStartTime!= null">
+                AND t.create_date &gt;= #{refundStartTime}
+            </if>
+            <if test=" refundEndTime != null">
+                AND t.create_date &lt;= #{refundEndTime}
+            </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
+
+    <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
+            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
+        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=" auditStatus != null and auditStatus != ''">
+                AND t3.audit_status = #{auditStatus}
+            </if>
+            <if test=" refundStartTime!= null">
+                AND t.create_date &gt;= #{refundStartTime}
+            </if>
+            <if test=" refundEndTime != null">
+                AND t.create_date &lt;= #{refundEndTime}
+            </if>
+        ORDER BY
+        t.create_date DESC
+    </select>
+
     <select id="countTotalRechargeAmount" resultType="java.lang.Integer">
         select sum(t.amount) as amount from ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id where t.org_id = #{orgId}
         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/TaOrgRefundApplicationMapper.xml

@@ -2,4 +2,15 @@
 <!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.TaOrgRefundApplicationMapper">
 
+    <select id="countRefundBlockedAmount" resultType="java.lang.Integer">
+
+        SELECT
+            sum( t.amount )
+        FROM
+            ta_org_refund_application t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.`status` = 0
+    </select>
+
 </mapper>

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

@@ -2,4 +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">
 
+
+
 </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>