* bug 修改

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

@@ -113,6 +113,7 @@ public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrain
                     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/excel/redPacket/AccountConsumeRecordExport.java

@@ -15,11 +15,11 @@ public class AccountConsumeRecordExport {
 
     @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

@@ -15,11 +15,11 @@ public class AccountPayRecordExport {
 
     @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

@@ -15,11 +15,11 @@ public class AccountRefundRecordExport {
 
     @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/TaOrgOrderController.java

@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletRequest;
 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;
@@ -268,7 +269,6 @@ public class TaOrgOrderController extends BaseController {
     /**
      * 查询接收人信息
      *
-     * @param id 实体ID
      */
     @RequestMapping(value = "/channel/receiveInfo", method = RequestMethod.GET)
     public ResponseBean receiveInfoGet(@RequestParam(required = false) String phone,
@@ -343,8 +343,8 @@ public class TaOrgOrderController extends BaseController {
     @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,
@@ -374,8 +374,8 @@ public class TaOrgOrderController extends BaseController {
      * @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,
@@ -411,8 +411,8 @@ public class TaOrgOrderController extends BaseController {
     @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,
@@ -439,8 +439,8 @@ public class TaOrgOrderController extends BaseController {
      * @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,
@@ -478,8 +478,8 @@ public class TaOrgOrderController extends BaseController {
     @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,
@@ -512,8 +512,8 @@ public class TaOrgOrderController extends BaseController {
      * @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/mapper/TaOrgOrderMapper.java

@@ -1,21 +1,20 @@
 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>
@@ -122,8 +121,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @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,
@@ -144,8 +143,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @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,
@@ -165,8 +164,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @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,
@@ -183,8 +182,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @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,
@@ -234,8 +233,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @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,
@@ -256,8 +255,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @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/service/ITaOrgOrderService.java

@@ -12,6 +12,7 @@ import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
 
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -118,7 +119,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @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);
 
     /**
@@ -133,7 +134,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @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;
 
     /**
@@ -148,7 +149,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @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);
 
     /**
@@ -162,7 +163,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @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;
 
     /**
      * 条件查询红包发送记录
@@ -192,7 +193,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @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);
 
     /**
@@ -208,5 +209,5 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @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/impl/TaOrgOrderServiceImpl.java

@@ -216,6 +216,16 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             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);
 
@@ -254,13 +264,32 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
-        // 3.请求微信接口获取支付二维码
+        // 3.创建账户消费流水表信息
+        TaOrgAccountDetailedList taOrgAccountDetailedList = new TaOrgAccountDetailedList();
+        taOrgAccountDetailedList.setAccountId(taOrgAccount.getAccountId());
+        taOrgAccountDetailedList.setOrgId(orgId);
+        taOrgAccountDetailedList.setAmount(amount);
+        taOrgAccountDetailedList.setSignType(1);
+        taOrgAccountDetailedList.setOrderId(taOrgOrder.getOrderId());
+        taOrgAccountDetailedList.setRemark("线上充值");
+        taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgAccountDetailedList.setUserId(userId);
+        taOrgAccountDetailedList.setUserName(taUser.getUserName());
+        taOrgAccountDetailedList.setCreateDate(LocalDateTime.now());
+        if (taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList) < 1) {
+            taOrgOrderMapper.deleteById(taOrgOrder.getOrderId());
+            taOrgOrderDetailMapper.deleteById(taOrgOrderDetail.getSerialNo());
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 4.请求微信接口获取支付二维码
         ResponseBean payResult = payUnifiedOrder(taOrgOrder, ip);
         if (ResponseBean.CODE_SUCCESS != payResult.getCode()) {
             return payResult;
         }
 
-        // 4.发送短信
+        // 5.发送短信
         ExecutorService threadPool = Executors.newCachedThreadPool();
         threadPool.execute(() -> {
             List<TaContact> taContacts = taOrgAccountService.selectSmsContactUser();
@@ -374,12 +403,30 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
+        // 6.创建账户消费流水表信息
+        TaOrgAccountDetailedList taOrgAccountDetailedList = new TaOrgAccountDetailedList();
+        taOrgAccountDetailedList.setAccountId(taOrgAccount.getAccountId());
+        taOrgAccountDetailedList.setOrgId(orgId);
+        taOrgAccountDetailedList.setAmount(amount);
+        taOrgAccountDetailedList.setSignType(-1);
+        taOrgAccountDetailedList.setOrderId(taOrgOrder.getOrderId());
+        taOrgAccountDetailedList.setRemark("线上申请退款");
+        taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgAccountDetailedList.setUserId(userId);
+        taOrgAccountDetailedList.setUserName(taUser.getUserName());
+        taOrgAccountDetailedList.setCreateDate(LocalDateTime.now());
+        if (taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList) < 1) {
+            taOrgOrderMapper.deleteById(taOrgOrder.getOrderId());
+            taOrgOrderDetailMapper.deleteById(taOrgOrderDetail.getSerialNo());
+            taOrgAccountBlockedMapper.deleteById(taOrgAccountBlocked.getSerialNo());
+            responseBean.addError("fail");
+            return responseBean;
+        }
 
-
-        // 6.更新账户新金额
+        // 7.更新账户新金额
         taOrgAccountMapper.updateAvailableBalanceById(taOrgAccount.getAccountId(), amount);
 
-        // 7.发送短信
+        // 8.发送短信
         ExecutorService threadPool = Executors.newCachedThreadPool();
         threadPool.execute(() -> {
             List<TaContact> taContacts = taOrgAccountService.selectSmsContactUser();
@@ -395,7 +442,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @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);
@@ -420,7 +467,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @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");
@@ -431,7 +478,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @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);
@@ -456,7 +503,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @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);
@@ -474,7 +521,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @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));
@@ -482,7 +529,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @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);

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

@@ -228,11 +228,11 @@
 
     <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
@@ -301,11 +301,11 @@
 
     <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'
@@ -325,7 +325,7 @@
             <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">
@@ -381,10 +381,13 @@
         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
@@ -431,8 +434,8 @@
 
     <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,
@@ -479,6 +482,7 @@
             <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/TaRedPacketMapper.xml

@@ -121,7 +121,7 @@
             t2.name,
             t2.avatarurl,
             t2.phone,
-            t3.nickname sharePersonNickname,
+            ifnull(t3.nickname,t3.name) sharePersonNickname,
             t3.phone sharePersonPhone
         FROM
             ta_customer_from t
@@ -145,6 +145,8 @@
             <if test="phone != null and phone != ''">
                 AND t2.phone like CONCAT('%',#{phone}, '%')
             </if>
+        GROUP BY
+           t.person_id
          ORDER BY
             t.create_date desc
     </select>
@@ -156,12 +158,12 @@
         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' )
@@ -180,6 +182,8 @@
         <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

@@ -20,7 +20,7 @@
                 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">
@@ -42,9 +42,7 @@
                 AND t2.phone like concat('%',#{phone},'%')
             </if>
         ORDER BY
-            t.votes DESC
+            t.votes DESC,t.create_date DESC
     </select>
 
-
-
 </mapper>