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

src/main/java/com/huiju/estateagents/drainage/service/impl/TaDrainageServiceImpl.java

                     taRedPacket.setStartDate(LocalDateTime.now().plusDays(1));
                     taRedPacket.setQrcode(taDrainage.getQrCode());
                     taRedPacket.setEndDate(DateUtils.dayToLocalDateime(taDrainage.getEndDate()));
+                    taRedPacket.setBuildingId(taDrainage.getBuildingId());
                     iTaRedPacketService.initializeRedPacket(taRedPacket,orgId);
 
                     taDrainage.setH5Address(String.format(taH5Template.getActivityUrl(), activityId));

src/main/java/com/huiju/estateagents/entity/TaCustomerFrom.java

      */
     @TableField(exist = false)
     private String name;
+
+    @TableField(exist = false)
+    private String phone;
 }

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

 
     @ColumnWidth(15)
     @ExcelProperty(value = "订单编号", index = 0)
-    private String orderId;
+    private String tradeNo;
 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "消费金额", index = 1)
+    @ExcelProperty(value = "消费金额（元）", index = 1)
     private String amount;
 
 

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

 
     @ColumnWidth(15)
     @ExcelProperty(value = "订单编号", index = 0)
-    private String orderId;
+    private String tradeNo;
 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "充值金额", index = 1)
+    @ExcelProperty(value = "充值金额（元）", index = 1)
     private String amount;
 
 

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

 
     @ColumnWidth(15)
     @ExcelProperty(value = "订单编号", index = 0)
-    private String orderId;
+    private String tradeNo;
 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "退款金额", index = 1)
+    @ExcelProperty(value = "退款金额（元）", index = 1)
     private String amount;
 
 

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

             export.setConsumeAmount(NumberUtils.fenToYuan(e.getPurchaseAmount().toString()));
             export.setRefundAmount(NumberUtils.fenToYuan(e.getTotalRefund().toString()));
             Integer balance = totalRechargeAmount - e.getPurchaseAmount() - e.getTotalRefund() - totalBlockAmount;
-            export.setBalance(NumberUtils.fenToYuan(totalRechargeAmount.toString()));
+            export.setBalance(NumberUtils.fenToYuan(balance.toString()));
 
             data.add(export);
         });

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

 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
     /**
      * 查询接收人信息
      *
-     * @param id 实体ID
      */
     @RequestMapping(value = "/channel/receiveInfo", method = RequestMethod.GET)
     public ResponseBean receiveInfoGet(@RequestParam(required = false) String phone,
     @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,
+                                               @RequestParam(value = "payStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime payStartTime,
+                                               @RequestParam(value = "payEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime payEndTime,
                                                String orderId,
                                                String tradeNo,
                                                String wxOrderId,
      * @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,
+    public void exportCzOrderByCondition(@RequestParam(value = "payStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime payStartTime,
+                                         @RequestParam(value = "payEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime payEndTime,
                                          String orderId,
                                          String tradeNo,
                                          String wxOrderId,
     @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,
+                                                   @RequestParam(value = "refundStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime refundStartTime,
+                                                   @RequestParam(value = "refundEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime refundEndTime,
                                                    String orderId,
                                                    String wxOrderId,
                                                    String tradeNo,
      * @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,
+    public void exportRefundOrderByCondition(@RequestParam(value = "refundStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime refundStartTime,
+                                             @RequestParam(value = "refundEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime refundEndTime,
                                              String orderId,
                                              String wxOrderId,
                                              String tradeNo,
     @RequestMapping(value = "/admin/orgOrder/listConsumeOrderByCondition", method = RequestMethod.GET)
     public ResponseBean listConsumeOrderByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                    @RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startTime,
-                                                    @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
+                                                    @RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
+                                                    @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
                                                     String orderId,
                                                     String wxOrderId,
                                                     String tradeNo,
      * @throws Exception
      */
     @RequestMapping(value = "/admin/orgOrder/exportConsumeOrderByCondition", method = RequestMethod.GET)
-    public void exportConsumeOrderByCondition(@RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startTime,
-                                              @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
+    public void exportConsumeOrderByCondition(@RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
+                                              @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
                                               String orderId,
                                               String wxOrderId,
                                               String tradeNo,

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

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
     @RequestMapping(value = "/admin/redPacket/listVisitRecordByCondition", method = RequestMethod.GET)
     public ResponseBean listVisitRecordByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                   @RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startTime,
-                                                   @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
+                                                   @RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
+                                                   @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
                                                    String drainageId,
                                                    String phone,
                                                    String sharePersonPhone,
      * @return
      */
     @RequestMapping(value = "/admin/redPacket/exportVisitRecordByCondition", method = RequestMethod.GET)
-    public void exportVisitRecordByCondition(@RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startTime,
-                                             @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
+    public void exportVisitRecordByCondition(@RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
+                                             @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
                                              String drainageId,
                                              String phone,
                                              String sharePersonPhone,

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

      */
     private LocalDateTime createDate;
 
+    /**
+     * 冻结ID
+     */
+    private Integer blockedId;
+
     /**
      * 状态
      */

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

 package com.huiju.estateagents.redpack.mapper;
 
-import java.time.LocalDate;
-import java.util.List;
-import java.util.Map;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.excel.redPacket.AccountConsumeRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountPayRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountRefundRecordExport;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.redpack.entity.ConsumeOrder;
 import com.huiju.estateagents.redpack.entity.RechargeOrder;
 import com.huiju.estateagents.redpack.entity.RefundOrder;
 import com.huiju.estateagents.redpack.entity.TaOrgOrder;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
      * @return
      */
     IPage<TaOrgOrder> listCzOrderByCondition(IPage<TaOrgOrder> page,
-                                             @Param("payStartTime") LocalDate payStartTime,
-                                             @Param("payEndTime") LocalDate payEndTime,
+                                             @Param("payStartTime") LocalDateTime payStartTime,
+                                             @Param("payEndTime") LocalDateTime payEndTime,
                                              @Param("orderId") String orderId,
                                              @Param("tradeNo") String tradeNo,
                                              @Param("wxOrderId") String wxOrderId,
      * @param orgId
      * @return
      */
-    List<AccountPayRecordExport> exportCzOrderByCondition(@Param("payStartTime") LocalDate payStartTime,
-                                                          @Param("payEndTime") LocalDate payEndTime,
+    List<AccountPayRecordExport> exportCzOrderByCondition(@Param("payStartTime") LocalDateTime payStartTime,
+                                                          @Param("payEndTime") LocalDateTime payEndTime,
                                                           @Param("orderId") String orderId,
                                                           @Param("tradeNo") String tradeNo,
                                                           @Param("wxOrderId") String wxOrderId,
      * @return
      */
     IPage<TaOrgOrder> listRefundOrderByCondition(IPage<TaOrgOrder> page,
-                                                 @Param("refundStartTime") LocalDate refundStartTime,
-                                                 @Param("refundEndTime") LocalDate refundEndTime,
+                                                 @Param("refundStartTime") LocalDateTime refundStartTime,
+                                                 @Param("refundEndTime") LocalDateTime refundEndTime,
                                                  @Param("orderId") String orderId,
                                                  @Param("wxOrderId") String wxOrderId,
                                                  @Param("tradeNo") String tradeNo,
      * @param orgId
      * @return
      */
-    List<AccountRefundRecordExport> exportRefundOrderByCondition(@Param("refundStartTime") LocalDate refundStartTime,
-                                                                 @Param("refundEndTime") LocalDate refundEndTime,
+    List<AccountRefundRecordExport> exportRefundOrderByCondition(@Param("refundStartTime") LocalDateTime refundStartTime,
+                                                                 @Param("refundEndTime") LocalDateTime refundEndTime,
                                                                  @Param("orderId") String orderId,
                                                                  @Param("wxOrderId") String wxOrderId,
                                                                  @Param("tradeNo") String tradeNo,
      * @return
      */
     IPage<TaOrgOrder> listConsumeOrderByCondition(IPage<TaOrgOrder> page,
-                                                  @Param("startTime") LocalDate startTime,
-                                                  @Param("endTime") LocalDate endTime,
+                                                  @Param("startTime") LocalDateTime startTime,
+                                                  @Param("endTime") LocalDateTime endTime,
                                                   @Param("orderId") String orderId,
                                                   @Param("tradingStatus") String tradingStatus,
                                                   @Param("consumeType") String consumeType,
      * @param orgId
      * @return
      */
-    List<AccountConsumeRecordExport> exportConsumeOrderByCondition(@Param("startTime") LocalDate startTime,
-                                                                   @Param("endTime") LocalDate endTime,
+    List<AccountConsumeRecordExport> exportConsumeOrderByCondition(@Param("startTime") LocalDateTime startTime,
+                                                                   @Param("endTime") LocalDateTime endTime,
                                                                    @Param("orderId") String orderId,
                                                                    @Param("tradingStatus") String tradingStatus,
                                                                    @Param("consumeType") String consumeType,

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

      * @param orgId
      * @return
      */
-    List<TaRedPacketHistory> getRanking(String activityId, Integer orgId);
+    List<TaRedPacketHistory> getRanking(String activityId, Integer orgId ,Integer top);
 }

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

                           @Param("startDate") LocalDateTime startDate,
                           @Param("endDate") LocalDateTime endDate,
                           @Param("templeActivityId") String templeActivityId,
+                          @Param("buildingId") String buildingId,
                           @Param("orgId") Integer orgId);
 
     /**
      * @return
      */
     IPage<TaCustomerFrom> listVisitRecordByCondition(IPage<TaCustomerFrom> page,
-                                                     @Param("startTime") LocalDate startTime,
-                                                     @Param("endTime") LocalDate endTime,
+                                                     @Param("startTime") LocalDateTime startTime,
+                                                     @Param("endTime") LocalDateTime endTime,
                                                      @Param("drainageId") String drainageId,
                                                      @Param("phone") String phone,
                                                      @Param("sharePersonPhone") String sharePersonPhone,
      * @param orgId
      * @return
      */
-    List<RedPacketVisitRecordtExport> exportVisitRecordByCondition(@Param("startTime") LocalDate startTime,
-                                                                   @Param("endTime") LocalDate endTime,
+    List<RedPacketVisitRecordtExport> exportVisitRecordByCondition(@Param("startTime") LocalDateTime startTime,
+                                                                   @Param("endTime") LocalDateTime endTime,
                                                                    @Param("drainageId") String drainageId,
                                                                    @Param("phone") String phone,
                                                                    @Param("sharePersonPhone") String sharePersonPhone,

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

 
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
      * @param tradingStatus
      * @return
      */
-    ResponseBean listCzOrderByCondition(Integer pageNum, Integer pageSize, LocalDate payStartTime, LocalDate payEndTime, String orderId, String tradeNo,
+    ResponseBean listCzOrderByCondition(Integer pageNum, Integer pageSize, LocalDateTime payStartTime, LocalDateTime payEndTime, String orderId, String tradeNo,
                                         String wxOrderId, Boolean isOffline, String tradingStatus, Integer orgId);
 
     /**
      * @param tradingStatus
      * @return
      */
-    void exportCzOrderByCondition(LocalDate payStartTime, LocalDate payEndTime, String orderId, String tradeNo, String wxOrderId,
+    void exportCzOrderByCondition(LocalDateTime payStartTime, LocalDateTime payEndTime, String orderId, String tradeNo, String wxOrderId,
                                   Boolean isOffline, String tradingStatus, Integer orgId, HttpServletResponse response) throws Exception;
 
     /**
      * @param orgId
      * @return
      */
-    ResponseBean listRefundOrderByCondition(Integer pageNum, Integer pageSize, LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, String wxOrderId,
+    ResponseBean listRefundOrderByCondition(Integer pageNum, Integer pageSize, LocalDateTime refundStartTime, LocalDateTime refundEndTime, String orderId, String auditStatus, String wxOrderId,
                                             String tradeNo, Integer orgId);
 
     /**
      * @param response
      * @throws Exception
      */
-    void exportRefundOrderByCondition(LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, String wxOrderId,String tradeNo, Integer orgId, HttpServletResponse response) throws Exception;
+    void exportRefundOrderByCondition(LocalDateTime refundStartTime, LocalDateTime refundEndTime, String orderId, String auditStatus, String wxOrderId,String tradeNo, Integer orgId, HttpServletResponse response) throws Exception;
 
     /**
      * 条件查询红包发送记录
      * @param orgId
      * @return
      */
-    ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, String tradingStatus,
+    ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDateTime startTime, LocalDateTime endTime, String orderId, String tradingStatus,
                                              String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId);
 
     /**
      * @param response
      * @throws Exception
      */
-    void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, String tradingStatus, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception;
+    void exportConsumeOrderByCondition(LocalDateTime startTime, LocalDateTime endTime, String orderId, String tradingStatus, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception;
 }

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

 
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * <p>
      * @param orgId
      * @return
      */
-    ResponseBean listVisitRecordByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId);
+    ResponseBean listVisitRecordByCondition(Integer pageNum, Integer pageSize, LocalDateTime startTime, LocalDateTime endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId);
 
     /**
      * 导出客户访问记录
      * @param sharePersonPhone
      * @param orgId
      */
-    void exportVisitRecordByCondition(LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception;
+    void exportVisitRecordByCondition(LocalDateTime startTime, LocalDateTime endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception;
 
 
 }

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

         IPage<TaOrgOrder> result = pg;
 
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
-            List<String> urlList = new ArrayList<>();
             result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, auditStatus, payStartDate, payEndDate);
             result.getRecords().forEach(e -> {
                 e.setCertificateUrlList(getCertificateByOrderId(e.getOrderId()));
             return responseBean;
         }
 
+        // 查询账户信息
+        QueryWrapper<TaOrgAccount> orgAccountQueryWrapper = new QueryWrapper<>();
+        orgAccountQueryWrapper.eq("org_id", orgId);
+        orgAccountQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(orgAccountQueryWrapper);
+        if (taOrgAccount == null) {
+            responseBean.addError("账户不存在");
+            return responseBean;
+        }
+
         // 计算实付金额
         Integer realAmount = calculateRealAmount(amount);
 
             return responseBean;
         }
 
-        // 4.创建账户退款申请表信息
+        // 4.创建冻结表数据
+        TaOrgAccountBlocked taOrgAccountBlocked = new TaOrgAccountBlocked();
+        taOrgAccountBlocked.setAccountId(taOrgAccount.getAccountId());
+        taOrgAccountBlocked.setBlockedBalance(amount);
+        taOrgAccountBlocked.setBlockedReason("线上退款申请");
+        taOrgAccountBlocked.setCreateDate(LocalDateTime.now());
+        taOrgAccountBlocked.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgAccountBlocked.setOrgId(orgId);
+        taOrgAccountBlockedMapper.insert(taOrgAccountBlocked);
+
+        // 5.创建账户退款申请表信息
         TaOrgRefundApplication taOrgRefundApplication = new TaOrgRefundApplication();
         taOrgRefundApplication.setOrgId(orgId);
         taOrgRefundApplication.setUserId(userId);
         taOrgRefundApplication.setAuditStatus(CommConstant.CHECK_STATUS_CHECKING);
         taOrgRefundApplication.setOrderId(taOrgOrder.getOrderId());
         taOrgRefundApplication.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgRefundApplication.setBlockedId(taOrgAccountBlocked.getSerialNo());
         taOrgRefundApplication.setCreateDate(LocalDateTime.now());
         taOrgRefundApplication.setReason("线上申请退款");
         if (taOrgRefundApplicationMapper.insert(taOrgRefundApplication) < 1) {
             return responseBean;
         }
 
-        // 5.创建冻结表数据
-        TaOrgAccountBlocked taOrgAccountBlocked = new TaOrgAccountBlocked();
-        taOrgAccountBlocked.setAccountId(taOrgAccount.getAccountId());
-        taOrgAccountBlocked.setBlockedBalance(amount);
-        taOrgAccountBlocked.setBlockedReason("线上退款申请");
-        taOrgAccountBlocked.setCreateDate(LocalDateTime.now());
-        taOrgAccountBlocked.setStatus(CommConstant.STATUS_NORMAL);
-        taOrgAccountBlocked.setOrgId(orgId);
-        taOrgAccountBlockedMapper.insert(taOrgAccountBlocked);
-
         // 6.更新账户新金额
         taOrgAccountMapper.updateAvailableBalanceById(taOrgAccount.getAccountId(), amount);
 
     }
 
     @Override
-    public ResponseBean listCzOrderByCondition(Integer pageNum, Integer pageSize, LocalDate payStartTime, LocalDate payEndTime,
+    public ResponseBean listCzOrderByCondition(Integer pageNum, Integer pageSize, LocalDateTime payStartTime, LocalDateTime payEndTime,
                                                String orderId, String tradeNo, String wxOrderId, Boolean isOffline, String tradingStatus, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
     }
 
     @Override
-    public void exportCzOrderByCondition(LocalDate payStartTime, LocalDate payEndTime, String orderId, String tradeNo,
+    public void exportCzOrderByCondition(LocalDateTime payStartTime, LocalDateTime 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");
     }
 
     @Override
-    public ResponseBean listRefundOrderByCondition(Integer pageNum, Integer pageSize, LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, String wxOrderId, String tradeNo, Integer orgId) {
+    public ResponseBean listRefundOrderByCondition(Integer pageNum, Integer pageSize, LocalDateTime refundStartTime, LocalDateTime refundEndTime, String orderId, String auditStatus, String wxOrderId, String tradeNo, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
         pg = taOrgOrderMapper.listRefundOrderByCondition(pg, refundStartTime, refundEndTime, orderId, wxOrderId, tradeNo, auditStatus, orgId);
     }
 
     @Override
-    public void exportRefundOrderByCondition(LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception {
+    public void exportRefundOrderByCondition(LocalDateTime refundStartTime, LocalDateTime refundEndTime, String orderId, String auditStatus, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
         List<AccountRefundRecordExport> records = taOrgOrderMapper.exportRefundOrderByCondition(refundStartTime, refundEndTime, orderId, wxOrderId, tradeNo, auditStatus, orgId);
     }
 
     @Override
-    public ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, String tradingStatus, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId) {
+    public ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDateTime startTime, LocalDateTime endTime, String orderId, String tradingStatus, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
         responseBean.addSuccess(taOrgOrderMapper.listConsumeOrderByCondition(pg, startTime, endTime, orderId, tradingStatus, consumeType, phone, wxOrderId, tradeNo, orgId));
     }
 
     @Override
-    public void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, String tradingStatus, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception {
+    public void exportConsumeOrderByCondition(LocalDateTime startTime, LocalDateTime endTime, String orderId, String tradingStatus, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
         List<AccountConsumeRecordExport> records = taOrgOrderMapper.exportConsumeOrderByCondition(startTime, endTime, orderId, tradingStatus, consumeType, wxOrderId, tradeNo, phone, orgId);
         taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
 
         //更新账户退款申请
+        TaOrgRefundApplication selectRefundApplication = selectRefundApplication(id);
+
         TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REFUND, refundApplication);
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
         taOrgRefundApplicationQueryWrapper.eq("order_id", id);
+        taOrgRefundApplicationQueryWrapper.eq("blocked_id", selectRefundApplication.getBlockedId());
         taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
 
         //更新账户冻结记录
-        updateOrgAccountBlock(refundApplication);
+        updateOrgAccountBlock(refundApplication, selectRefundApplication.getBlockedId());
 
         //插入凭证记录
         if (CollectionUtils.isNotEmpty(refundApplication.getCertificateList())) {
         TaOrgAccount taOrgAccount = assembleRefundAccount(refundApplication.getOrgId(), refundApplication, CommConstant.ITEM_TYPE_REJECT);
         taOrgAccountMapper.updateById(taOrgAccount);
 
-        //更新账户冻结记录
-        int taOrgAccountBlockedUpdateResult = updateOrgAccountBlock(refundApplication);
-
         //更新退款申请记录
+        TaOrgRefundApplication selectRefundApplication = selectRefundApplication(id);
+
         TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REJECT, refundApplication);
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
         taOrgRefundApplicationQueryWrapper.eq("order_id", id);
         int taOrgRefundApplicationUpdateResult = taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
 
+        //更新账户冻结记录
+        int taOrgAccountBlockedUpdateResult = updateOrgAccountBlock(refundApplication, selectRefundApplication.getBlockedId());
+
         //更新订单状态
         TaOrgOrder taOrgOrder = new TaOrgOrder();
         taOrgOrder.setOrderId(id);
         rechargeAccount.setAccountId(selectOneAccount.getAccountId());
 
         if (CommConstant.ITEM_TYPE_REFUND.equals(operateType)) {
-            TaOrgRefundApplication taOrgRefundApplication = selectRefundApplication(refundApplication);
+            TaOrgRefundApplication taOrgRefundApplication = selectRefundApplication(refundApplication.getOrderId());
             rechargeAccount.setRealBalance(selectOneAccount.getRealBalance() - taOrgRefundApplication.getAmount());
             rechargeAccount.setTotalRefund(selectOneAccount.getTotalRefund() + taOrgRefundApplication.getAmount());
         }
 
         if (CommConstant.ITEM_TYPE_REJECT.equals(operateType)) {
-            TaOrgRefundApplication taOrgRefundApplication = selectRefundApplication(refundApplication);
+            TaOrgRefundApplication taOrgRefundApplication = selectRefundApplication(refundApplication.getOrderId());
             rechargeAccount.setAvailableBalance(selectOneAccount.getAvailableBalance() + taOrgRefundApplication.getAmount());
         }
 
         return taOrgRefundApplication;
     }
 
-    private Integer updateOrgAccountBlock(TaOrgRefundApplication refundApplication) {
+    private Integer updateOrgAccountBlock(TaOrgRefundApplication refundApplication, Integer blockedId) {
         //更新账户冻结记录
         TaOrgAccountBlocked taOrgAccountBlocked = new TaOrgAccountBlocked();
         taOrgAccountBlocked.setStatus(CommConstant.STATUS_UNACCALIMED);
         QueryWrapper<TaOrgAccountBlocked> taOrgAccountBlockedQueryWrapper = new QueryWrapper<>();
         taOrgAccountBlockedQueryWrapper.eq("org_id", refundApplication.getOrgId());
+        taOrgAccountBlockedQueryWrapper.eq("serial_no", blockedId);
         return taOrgAccountBlockedMapper.update(taOrgAccountBlocked, taOrgAccountBlockedQueryWrapper);
     }
 
         return sysUser;
     }
 
-    public TaOrgRefundApplication selectRefundApplication(TaOrgRefundApplication refundApplication) {
+    public TaOrgRefundApplication selectRefundApplication(String orderId) {
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
-        taOrgRefundApplicationQueryWrapper.eq("order_id", refundApplication.getOrderId());
+        taOrgRefundApplicationQueryWrapper.eq("order_id", orderId);
         return taOrgRefundApplicationMapper.selectOne(taOrgRefundApplicationQueryWrapper);
     }
 

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

         // 获取小程序信息
         QueryWrapper<TaMiniapp> miniappQueryWrapper =new QueryWrapper<>();
         miniappQueryWrapper.eq("org_id",orgId);
-        miniappQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(miniappQueryWrapper);
 
         // 初始化数据
-        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getTempleActivityId(), record.getOrgId());
+        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getTempleActivityId(),record.getBuildingId(), record.getOrgId());
         taRedPacketMapper.initRedPacketHelp(record.getActivityId(), record.getTempleActivityId());
         taRedPacketMapper.initRedPacketClient(record.getActivityId(), record.getName(), taMiniapp.getName(),record.getTempleActivityId());
         taRedPacketMapper.initRedPacketMoney(record.getActivityId(), record.getTempleActivityId());
     }
 
     @Override
-    public ResponseBean listVisitRecordByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId) {
+    public ResponseBean listVisitRecordByCondition(Integer pageNum, Integer pageSize, LocalDateTime startTime, LocalDateTime endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaCustomerFrom> pg = new Page<>(pageNum, pageSize);
         responseBean.addSuccess(taRedPacketMapper.listVisitRecordByCondition(pg, startTime, endTime, drainageId, phone, sharePersonPhone, orgId));
     }
 
     @Override
-    public void exportVisitRecordByCondition(LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception {
+    public void exportVisitRecordByCondition(LocalDateTime startTime, LocalDateTime endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
         List<RedPacketVisitRecordtExport> records = taRedPacketMapper.exportVisitRecordByCondition(startTime, endTime, drainageId, phone, sharePersonPhone, orgId);

src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java

     public ResponseBean getRanking(String drainageId) {
         //第一步根据drainggeid查询出红包表对应的记录
         TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
+
+        int top = 100;
+        if(taDrainage.getActivityType()=="RedPacket"){
+            TaRedPacket taRedPacket = taRedPacketMapper.selectById(taDrainage.getActivityId());
+            top = taRedPacket.getTopLimitPersons();
+        }
+
+//                .selectById(taDrainage.getActivityId())
         //第二步查询出这个H5对应的活动
-        List<TaRedPacketHistory> taRedPacketHistoryList = taRedPacketHistoryMapper.getRanking(taDrainage.getActivityId(), taDrainage.getOrgId());
+        List<TaRedPacketHistory> taRedPacketHistoryList = taRedPacketHistoryMapper.getRanking(taDrainage.getActivityId(), taDrainage.getOrgId(), top);
         return ResponseBean.success(taRedPacketHistoryList);
     }
 
                 .wxAppid(mpAppid)//公众账号appid
                 .build();
         try {
-            logger.info("发送微信红包请求参数：{}", JSONObject.toJSONString(build));
+            logger.info("发起助力 发送微信红包请求参数：{}", JSONObject.toJSONString(build));
             WxPaySendRedpackResult wxPaySendRedpackResult = wxPayService.sendRedpack(build);
-            logger.info("发送微信红包返回结果：{}", JSONObject.toJSONString(wxPaySendRedpackResult));
+            logger.info("发起助力 发送微信红包返回结果：{}", JSONObject.toJSONString(wxPaySendRedpackResult));
             String resultCode = wxPaySendRedpackResult.getResultCode();
             if (resultCode.equals("SUCCESS")) {
                 taRedPacketMoney.setPacketSendedNum(taRedPacketMoney.getPacketSendedNum() + 1);

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

         if(t.is_offline = 1, '运营手工充值', '业务线上充值') as isOffline,
         t.create_date as createDate,
         if(t.trading_status = 'processing', '待支付', if(t.trading_status = 'success', '已支付','已超时')) as tradingStatus,
-        t.pay_date as payDate
+        if(t.is_offline = 0, t.pay_date, '') as payDate
         From ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id
         left join ta_miniapp b on t.org_id = b.org_id
 
     <select id="exportCzOrderByCondition" resultType="com.huiju.estateagents.excel.redPacket.AccountPayRecordExport">
         SELECT
-            t.order_id,
-            t.amount,
+            t.trade_no,
+            FORMAT(t.amount/100,2) 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,
+            ( CASE t.trading_status WHEN 'success' THEN '已支付' WHEN 'processing' THEN '待支付' ELSE '失败' END ) tradingStatus,
             t.pay_date
         FROM
           ta_org_order t
 
     <select id="exportRefundOrderByCondition" resultType="com.huiju.estateagents.excel.redPacket.AccountRefundRecordExport">
         SELECT
-            t.order_id,
-            t.amount,
+            t.trade_no,
+            FORMAT(t.amount/100,2) amount,
             t.create_date,
             ( CASE t3.audit_status WHEN 'agree' THEN '已退款' WHEN 'unagree' THEN '已驳回' ELSE '已申请' END ) tradingStatus,
-            t3.audit_result
+            ( CASE t3.audit_status WHEN 'agree' then  '' ELSE t3.audit_result end) 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'
             <if test=" auditStatus != null and auditStatus != ''">
                 AND t3.audit_status = #{auditStatus}
             </if>
-            <if test=" refundStartTime!= null">
+            <if test=" refundStartTime != null">
                 AND t.create_date &gt;= #{refundStartTime}
             </if>
             <if test=" refundEndTime != null">
         SELECT
             t.*,
             t3.phone,
-            t2.item_type consumeType
+            t2.item_type consumeType,
             <if test="consumeType == 'RedPacket'">
-                ,t4.name activityName
+                t4.name activityName,
             </if>
+            t3.avatarurl,
+            t3.name,
+            t3.nickname
         FROM
             ta_org_order t
             INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id
 
     <select id="exportConsumeOrderByCondition" resultType="com.huiju.estateagents.excel.redPacket.AccountConsumeRecordExport">
         SELECT
-            t.order_id,
-            t.amount,
+            t.trade_no,
+            FORMAT(t.amount/100,2) amount,
             ( CASE t2.item_type WHEN 'RedPacket' THEN '红包' ELSE '' END ) consumeType,
             <if test="consumeType == 'RedPacket'">
                 t4.name activityName,
             <if test = "phone != null and phone != ''">
                 AND t3.phone like concat('%',#{phone},'%')
             </if>
+
         ORDER BY
             t.create_date DESC
     </select>

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

         LEFT JOIN ta_person p ON t.target_miniapp_person = p.person_id
         ORDER BY
         t.helpPersonNum DESC
+        limit #{top}
     </select>
 </mapper>

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

         #{qrCode},
         `top_limit_persons`,
         `building_show_pos`,
-        `building_id`,
+        #{buildingId},
         `building_name`,
         `poster_show_pos`,
         `join_fields`,
             t2.name,
             t2.avatarurl,
             t2.phone,
-            t3.nickname sharePersonNickname,
+            ifnull(t3.nickname,t3.name) sharePersonNickname,
             t3.phone sharePersonPhone
         FROM
             ta_customer_from t
             </if>
 
             <if test="sharePersonPhone != null and sharePersonPhone != ''">
-                AND t3.phone = #{sharePersonPhone}
+                AND t3.phone like CONCAT('%',#{sharePersonPhone}, '%')
             </if>
             <if test="phone != null and phone != ''">
-                AND t2.phone = #{phone}
+                AND t2.phone like CONCAT('%',#{phone}, '%')
             </if>
+        GROUP BY
+           t.person_id
          ORDER BY
             t.create_date desc
     </select>
         t2.NAME,
         t2.avatarurl,
         t2.phone,
-        t3.nickname sharePersonNickname,
+        ifnull(t3.nickname,t3.name) sharePersonNickname,
         t3.phone sharePersonPhone
         FROM
         ta_customer_from t
         LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
-        LEFT JOIN ta_person t3 ON t.share_person_id = t2.person_id
+        LEFT JOIN ta_person t3 ON t.share_person_id = t3.person_id
         WHERE
         t.org_id = #{orgId}
         AND t.target_type IN ( 'h5', 'dynamic' )
         <if test="phone != null and phone != ''">
             AND t2.phone = #{phone}
         </if>
+        GROUP BY
+        t.person_id
         ORDER BY
         t.create_date desc
     </select>

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

                 AND t2.phone like concat('%',#{phone},'%')
             </if>
         ORDER BY
-            t.votes DESC
+            t.votes DESC,t.create_date DESC
     </select>
 
     <select id="exportRedPacketRankingList" resultType="com.huiju.estateagents.excel.redPacket.RedPacketRankingListExport">
                 AND t2.phone like concat('%',#{phone},'%')
             </if>
         ORDER BY
-            t.votes DESC
+            t.votes DESC,t.create_date DESC
     </select>
 
-
-
 </mapper>