新需求

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

@@ -1,4 +1,14 @@
 package com.huiju.estateagents.common;
 
+import java.math.BigDecimal;
+
 public class NumberUtils {
+    /**
+     * 元转分（乘以100）
+     * @param amount 金额 分（支持大数字，16位以上）
+     * @return
+     */
+    public static Integer yuanToFen(String amount){
+        return new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
+    }
 }

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

@@ -101,37 +101,82 @@ public class TaOrgOrderController extends BaseController {
     }
 
     /**
-     * 订单导出
+     * 充值订单导出
      *
      * @return
      */
-    @GetMapping(value = "/channel/taOrgOrder/orgOrderExport")
-    public void selectActivityVisitPersonNumExport(@RequestParam(value = "orderType", required = false) String orderType,
-                                                   @RequestParam(value = "orgId", required = false) Integer orgId,
-                                                   @RequestParam(value = "tradeNo", required = false) String tradeNo,
+    @RequestMapping(value = "/channel/taOrgOrder/rechargeOrderExport")
+    public void rechargeOrderExport(@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 = "miniAppName", required = false) String miniAppName,
                                                    @RequestParam(value = "startDate", required = false) String startDate,
                                                    @RequestParam(value = "endDate", required = false) String endDate,
+                                                   @RequestParam(value = "orderType", required = false) String orderType,
                                                    HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=订单统计.xlsx");
-        ExcelWriter excelWriter = null;
-        if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType)) {
-            excelWriter = EasyExcel.write(response.getOutputStream(), RechargeOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
-        } else if (CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
-            excelWriter = EasyExcel.write(response.getOutputStream(), RefundOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
-        } else {
-            excelWriter = EasyExcel.write(response.getOutputStream(), ConsumeOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
-        }
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), RechargeOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+
+        // 设置 sheet, 同一个sheet只需要设置一次
+        List<RechargeOrder> data = iTaOrgOrderService.rechargeListByConditionExport(orderType, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 消费订单导出
+     *
+     * @return
+     */
+    @RequestMapping(value = "/channel/taOrgOrder/consumeOrderExport")
+    public void consumeOrderExport(@RequestParam(value = "tradeNo", required = false) String tradeNo,
+                                   @RequestParam(value = "tradingStatus", required = false) String tradingStatus,
+                                   @RequestParam(value = "receivePhone", required = false) String receivePhone,
+                                   @RequestParam(value = "miniAppName", required = false) String miniAppName,
+                                   @RequestParam(value = "startDate", required = false) String startDate,
+                                   @RequestParam(value = "endDate", required = false) String endDate,
+                                   @RequestParam(value = "orderType", required = false) String orderType,
+                                   HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=订单统计.xlsx");
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), RechargeOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
 
         // 设置 sheet, 同一个sheet只需要设置一次
+        List<ConsumeOrder> data = iTaOrgOrderService.consumeListByConditionExport(orderType, tradeNo, receivePhone, tradingStatus, startDate, endDate, miniAppName);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 退款订单导出
+     *
+     * @return
+     */
+    @RequestMapping(value = "/channel/taOrgOrder/refundOrderExport")
+    public void refundOrderExport(@RequestParam(value = "tradeNo", required = false) String tradeNo,
+                                   @RequestParam(value = "miniAppName", required = false) String miniAppName,
+                                   @RequestParam(value = "startDate", required = false) String startDate,
+                                   @RequestParam(value = "endDate", required = false) String endDate,
+                                   @RequestParam(value = "orderType", required = false) String orderType,
+                                   HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=订单统计.xlsx");
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), RefundOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<TaOrgOrder> data = iTaOrgOrderService.listByConditionExport(orderType, orgId, tradeNo, isOffline, tradingStatus, receivePhone, itemType, startDate, endDate, miniAppName);
+
+        // 设置 sheet, 同一个sheet只需要设置一次
+        List<RefundOrder> data = iTaOrgOrderService.refundListByConditionExport(orderType, tradeNo, startDate, endDate, miniAppName);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

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

@@ -42,7 +42,7 @@ public class ConsumeOrder {
      */
     @ColumnWidth(15)
     @ExcelProperty(value = "消费下单时间", index = 5)
-    private LocalDateTime createDate;
+    private String createDate;
 
     /**
      * 接收人手机号

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

@@ -42,7 +42,7 @@ public class RechargeOrder {
      */
     @ColumnWidth(15)
     @ExcelProperty(value = "下单时间", index = 4)
-    private LocalDateTime createDate;
+    private String createDate;
 
     /**
      * 充值状态
@@ -56,5 +56,5 @@ public class RechargeOrder {
      */
     @ColumnWidth(15)
     @ExcelProperty(value = "支付时间", index = 6)
-    private LocalDateTime payDate;
+    private String payDate;
 }

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

@@ -35,7 +35,7 @@ public class RefundOrder {
      */
     @ColumnWidth(15)
     @ExcelProperty(value = "退款创建时间", index = 3)
-    private LocalDateTime createDate;
+    private String createDate;
 
     /**
      * 退款状态

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

@@ -89,13 +89,13 @@ public class TaOrgAccount implements Serializable {
      * 充值金额
      */
     @TableField(exist = false)
-    private Integer rechargeAmount;
+    private String rechargeAmount;
 
     /**
      * 退费金额
      */
     @TableField(exist = false)
-    private Integer refundAmount;
+    private String refundAmount;
 
     /**
      * 退款冻结金额

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

@@ -11,6 +11,9 @@ 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;
 
 /**
@@ -63,34 +66,39 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
     /**
      * 充值退款订单导出
      *
-     * @param orderType
      * @return
      */
-    List<TaOrgOrder> orderListByRechargeOrRefundExport(@Param("orderType") String orderType,
-                                                       @Param("orgId") Integer orgId,
-                                                       @Param("tradeNo") String tradeNo,
-                                                       @Param("isOffline") Integer isOffline,
-                                                       @Param("tradingStatus") String tradingStatus,
-                                                       @Param("startDate") String startDate,
-                                                       @Param("endDate") String endDate,
-                                                       @Param("miniAppName") String miniAppName);
+    List<RechargeOrder> orderListByRechargeOrRefundExport(@Param("itemType") String itemType,
+                                                          @Param("tradeNo") String tradeNo,
+                                                          @Param("isOffline") Integer isOffline,
+                                                          @Param("tradingStatus") String tradingStatus,
+                                                          @Param("startDate") String startDate,
+                                                          @Param("endDate") String endDate,
+                                                          @Param("miniAppName") String miniAppName);
 
     /**
      * 消费订单导出
      *
-     * @param orderType
-     * @param orgId
      * @return
      */
-    List<TaOrgOrder> orderListByConsumeExport(@Param("orderType") String orderType,
-                                              @Param("orgId") Integer orgId,
-                                              @Param("tradeNo") String tradeNo,
-                                              @Param("tradingStatus") String tradingStatus,
-                                              @Param("receivePhone") String receivePhone,
-                                              @Param("itemType") String itemType,
-                                              @Param("startDate") String startDate,
-                                              @Param("endDate") String endDate,
-                                              @Param("miniAppName") String miniAppName);
+    List<ConsumeOrder> orderListByConsumeExport(@Param("itemType") String itemType,
+                                                @Param("tradeNo") String tradeNo,
+                                                @Param("receivePhone") String receivePhone,
+                                                @Param("tradingStatus") String tradingStatus,
+                                                @Param("startDate") String startDate,
+                                                @Param("endDate") String endDate,
+                                                @Param("miniAppName") String miniAppName);
+
+    /**
+     * 退款订单导出
+     *
+     * @return
+     */
+    List<RefundOrder> orderListByRefundExport(@Param("itemType") String itemType,
+                                               @Param("tradeNo") String tradeNo,
+                                               @Param("startDate") String startDate,
+                                               @Param("endDate") String endDate,
+                                               @Param("miniAppName") String miniAppName);
 
     /**
      * 获取充值订单列表

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

@@ -4,6 +4,9 @@ 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.ConsumeOrder;
+import com.huiju.estateagents.redpack.entity.RechargeOrder;
+import com.huiju.estateagents.redpack.entity.RefundOrder;
 import com.huiju.estateagents.redpack.entity.TaOrgOrder;
 import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
 
@@ -51,12 +54,26 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
     IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, String startDate, String endDate, String miniAppName);
 
     /**
-     * 订单列表导出
+     * 充值订单列表导出
+     *
+     * @return
+     */
+    List<RechargeOrder> rechargeListByConditionExport(String itemType, String tradeNo, Integer isOffline, String tradingStatus, String startDate, String endDate, String miniAppName);
+
+    /**
+     * 消费订单列表导出
      *
-     * @param orderType
      * @return
      */
-    List<TaOrgOrder> listByConditionExport(String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, String startDate, String endDate, String miniAppName);
+    List<ConsumeOrder> consumeListByConditionExport(String itemType, String tradeNo, String receivePhone, String tradingStatus, String startDate, String endDate, String miniAppName);
+
+    /**
+     * 退款订单列表导出
+     *
+     * @return
+     */
+    List<RefundOrder> refundListByConditionExport(String itemType, String tradeNo, String startDate, String endDate, String miniAppName);
+
 
     /**
      * 微信支付

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

@@ -7,6 +7,7 @@ import java.util.List;
 
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import com.huiju.estateagents.center.sysUser.mapper.SysUserMapper;
+import com.huiju.estateagents.common.NumberUtils;
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.ss.formula.functions.T;
@@ -130,10 +131,13 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
             return responseBean;
         }
 
-//        TaContact taContact = selectSmsContactUser();
-//        String[] smsParams = {"业务平台充值成功", taOrgOrder.getTradeNo() + taOrgAccount.getMiniappName()};
-//        // 短信发送
-//        sendSmsMessage(taContact.getPhone(), CommConstant.ITEM_TYPE_RECHARGE, smsParams);
+//        List<TaContact> taContacts = selectSmsContactUser();
+//        if (CollectionUtils.isNotEmpty(taContacts)){
+//            TaContact taContact = taContacts.get(0);
+//            String[] smsParams = {"业务平台充值成功", taOrgOrder.getTradeNo() + taOrgAccount.getMiniappName()};
+//            // 短信发送
+//            sendSmsMessage(taContact.getPhone(), CommConstant.ITEM_TYPE_RECHARGE, smsParams);
+//        }
 
         return responseBean;
     }
@@ -145,7 +149,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
 
         //更新系统账户余额
         TaOrgAccount selectOneAccount = selectTaOrgAccountById(accountId);
-        if (selectOneAccount.getAvailableBalance() < taOrgAccount.getRefundAmount()) {
+        if (selectOneAccount.getAvailableBalance() < NumberUtils.yuanToFen(taOrgAccount.getRefundAmount())) {
             responseBean.addError("退款额不能大于余额");
             return responseBean;
         }
@@ -180,10 +184,13 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
             return responseBean;
         }
 
-        TaContact taContact = selectSmsContactUser();
-        String[] smsParams = {"业务平台退款申请", taOrgOrder.getTradeNo() + taOrgAccount.getMiniappName()};
-        // 短信发送
-        sendSmsMessage(taContact.getPhone(), CommConstant.ITEM_TYPE_REFUND, smsParams);
+//        List<TaContact> taContacts = selectSmsContactUser();
+//        if (CollectionUtils.isNotEmpty(taContacts)){
+//            TaContact taContact = taContacts.get(0);
+//            String[] smsParams = {"业务平台退款申请", taOrgOrder.getTradeNo() + taOrgAccount.getMiniappName()};
+//            // 短信发送
+//            sendSmsMessage(taContact.getPhone(), CommConstant.ITEM_TYPE_REFUND, smsParams);
+//        }
 
         return responseBean;
     }
@@ -237,8 +244,8 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
 
         TaOrgAccount rechargeAccount = new TaOrgAccount();
         rechargeAccount.setAccountId(accountId);
-        rechargeAccount.setAvailableBalance(selectOneAccount.getAvailableBalance() + taOrgAccount.getRechargeAmount());
-        rechargeAccount.setRealBalance(selectOneAccount.getRealBalance() + taOrgAccount.getRechargeAmount());
+        rechargeAccount.setAvailableBalance(selectOneAccount.getAvailableBalance() + NumberUtils.yuanToFen(taOrgAccount.getRechargeAmount()));
+        rechargeAccount.setRealBalance(selectOneAccount.getRealBalance() + NumberUtils.yuanToFen(taOrgAccount.getRechargeAmount()));
         rechargeAccount.setModifyDate(LocalDateTime.now());
 
         return rechargeAccount;
@@ -284,17 +291,17 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
      * @param userId
      * @return
      */
-    private TaOrgOrder assembleTaOrgOrder(Integer orgId, Integer amount, Integer userId, String consumeType) {
+    private TaOrgOrder assembleTaOrgOrder(Integer orgId, String amount, Integer userId, String consumeType) {
 
         SysUser taUser = selectUserById(userId);
         TaOrgOrder taOrgOrder = new TaOrgOrder();
         taOrgOrder.setOrgId(orgId);
         taOrgOrder.setTradeNo(CommonUtils.generateTradeNo(CommConstant.ITEM_TYPE_RECHARGE.equals(consumeType) ? CommConstant.RECHARGE : CommConstant.REFUND));
-        taOrgOrder.setAmount(amount);
+        taOrgOrder.setAmount(NumberUtils.yuanToFen(amount));
         taOrgOrder.setCreateDate(LocalDateTime.now());
         taOrgOrder.setExpiryDate(LocalDateTime.now());
         taOrgOrder.setRemark(CommConstant.ITEM_TYPE_RECHARGE.equals(consumeType) ? "线下账户缴费" : "线下账户退费");
-        taOrgOrder.setTradingStatus(String.valueOf(CommConstant.STATUS_NORMAL));
+        taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_SUCCESS);
         taOrgOrder.setIsOffline(true);
         taOrgOrder.setUserId(userId);
         taOrgOrder.setUserName(taUser.getUserName());
@@ -310,13 +317,13 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
      * @param amount
      * @return
      */
-    private TaOrgOrderDetail assembleTaOrgOrderDetail(String orderId, Integer orgId, Integer amount, String consumeType) {
+    private TaOrgOrderDetail assembleTaOrgOrderDetail(String orderId, Integer orgId, String amount, String consumeType) {
         TaOrgOrderDetail taOrgOrderDetail = new TaOrgOrderDetail();
 
         taOrgOrderDetail.setOrderId(orderId);
         taOrgOrderDetail.setOrgId(orgId);
         taOrgOrderDetail.setItemType(CommConstant.ITEM_TYPE_RECHARGE.equals(consumeType) ? CommConstant.ITEM_TYPE_RECHARGE : CommConstant.ITEM_TYPE_REFUND);
-        taOrgOrderDetail.setAmount(amount);
+        taOrgOrderDetail.setAmount(NumberUtils.yuanToFen(amount));
 
         return taOrgOrderDetail;
     }
@@ -336,7 +343,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         TaOrgAccountDetailedList taOrgAccountDetailed = new TaOrgAccountDetailedList();
         taOrgAccountDetailed.setAccountId(accountId);
         taOrgAccountDetailed.setOrgId(orgId);
-        taOrgAccountDetailed.setAmount(CommConstant.ITEM_TYPE_RECHARGE.equals(consumeType) ? taOrgAccount.getRechargeAmount() : taOrgAccount.getRefundAmount());
+        taOrgAccountDetailed.setAmount(CommConstant.ITEM_TYPE_RECHARGE.equals(consumeType) ? NumberUtils.yuanToFen(taOrgAccount.getRechargeAmount()) : NumberUtils.yuanToFen(taOrgAccount.getRefundAmount()));
         //1收入,-1支出
         taOrgAccountDetailed.setSignType(CommConstant.ITEM_TYPE_RECHARGE.equals(consumeType) ? CommConstant.STATUS_NORMAL : CommConstant.STATUS_DELETE);
         taOrgAccountDetailed.setRemark(CommConstant.ITEM_TYPE_RECHARGE.equals(consumeType) ? "线下账户缴费" : "线下账户退费");
@@ -359,9 +366,9 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
 
         TaOrgAccount refundAccount = new TaOrgAccount();
         refundAccount.setAccountId(accountId);
-        refundAccount.setAvailableBalance(selectOneAccount.getAvailableBalance() - taOrgAccount.getRefundAmount());
-        refundAccount.setRealBalance(selectOneAccount.getRealBalance() - taOrgAccount.getRefundAmount());
-        refundAccount.setTotalRefund(taOrgAccount.getRefundAmount() + selectOneAccount.getTotalRefund());
+        refundAccount.setAvailableBalance(selectOneAccount.getAvailableBalance() - NumberUtils.yuanToFen(taOrgAccount.getRefundAmount()));
+        refundAccount.setRealBalance(selectOneAccount.getRealBalance() - NumberUtils.yuanToFen(taOrgAccount.getRefundAmount()));
+        refundAccount.setTotalRefund(NumberUtils.yuanToFen(taOrgAccount.getRefundAmount()) + selectOneAccount.getTotalRefund());
         refundAccount.setModifyDate(LocalDateTime.now());
 
         return refundAccount;
@@ -407,11 +414,10 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         return success ? null : "短信发送失败";
     }
 
-    public TaContact selectSmsContactUser(){
-        //获取操作人
+    public List<TaContact> selectSmsContactUser(){
         QueryWrapper<TaContact> taContactQueryWrapper = new QueryWrapper<>();
         taContactQueryWrapper.eq("contact_Type", CommConstant.FINANCE);
-        TaContact taContact = taContactMapper.selectOne(taContactQueryWrapper);
-        return taContact;
+        List<TaContact> taContacts = taContactMapper.selectList(taContactQueryWrapper);
+        return taContacts;
     }
 }

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

@@ -109,17 +109,21 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @Override
-    public List<TaOrgOrder> listByConditionExport(String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, String startDate, String endDate, String miniAppName) {
-        List<TaOrgOrder> result = new ArrayList<>();
-        if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
-            result = taOrgOrderMapper.orderListByRechargeOrRefundExport(orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
-            return result;
-        } else if (CommConstant.ITEM_TYPE_REDPACKAGE.equals(orderType)) {
-            result = taOrgOrderMapper.orderListByConsumeExport(orderType, orgId, tradeNo, tradingStatus, receivePhone, itemType, startDate, endDate, miniAppName);
-            return result;
-        } else {
-            return result;
-        }
+    public List<RechargeOrder> rechargeListByConditionExport(String itemType, String tradeNo, Integer isOffline, String tradingStatus, String startDate, String endDate, String miniAppName) {
+        List<RechargeOrder> result = taOrgOrderMapper.orderListByRechargeOrRefundExport(itemType, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
+        return result;
+    }
+
+    @Override
+    public List<ConsumeOrder> consumeListByConditionExport(String itemType, String tradeNo, String receivePhone, String tradingStatus, String startDate, String endDate, String miniAppName) {
+        List<ConsumeOrder> result = taOrgOrderMapper.orderListByConsumeExport(itemType, tradeNo, receivePhone, tradingStatus, startDate, endDate, miniAppName);
+        return result;
+    }
+
+    @Override
+    public List<RefundOrder> refundListByConditionExport(String itemType, String tradeNo, String startDate, String endDate, String miniAppName) {
+        List<RefundOrder> result = taOrgOrderMapper.orderListByRefundExport(itemType, tradeNo, startDate, endDate, miniAppName);
+        return result;
     }
 
     /**

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

@@ -100,32 +100,21 @@
         GROUP BY t.order_id
     </select>
 
-    <select id="orderListByRechargeOrRefundExport" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
+    <select id="orderListByRechargeOrRefundExport" resultType="com.huiju.estateagents.redpack.entity.RechargeOrder">
         select
-        t.trade_no,
-        t.amount,
+        t.trade_no as tradeNo,
+        t.amount as amount,
         b.name as miniAppName,
-        t.is_offline,
-        t.create_date,
-        t.trading_status,
-        t.pay_date
-        <if test="orderType == 'recharge' || orderType == 'refund'">
-            d.audit_status,
-            d.audit_result,
-        </if>
-        GROUP_CONCAT(c.url) as certificateList
+        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
         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
         left join ta_org_account_certificate c on t.order_id = c.order_id
-        <if test="orderType == 'recharge' || orderType == 'refund'">
-            left join ta_org_refund_application d on d.org_id = t.org_id
-        </if>
         where
-        a.item_type = #{orderType}
-        <if test="orgId != null and orgId != ''">
-            and t.org_id = #{orgId}
-        </if>
+        a.item_type = #{itemType}
         <if test="tradeNo != null and tradeNo != ''">
             and t.trade_no like concat('%', #{tradeNo}, '%')
         </if>
@@ -147,14 +136,14 @@
         GROUP BY t.order_id
     </select>
 
-    <select id="orderListByConsumeExport" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
+    <select id="orderListByConsumeExport" resultType="com.huiju.estateagents.redpack.entity.ConsumeOrder">
         select
-        t.trade_no,
+        t.trade_no as tradeNo,
         b.name as miniAppName,
-        t.amount,
-        t.create_date,
-        c.phone,
-        t.trading_status,
+        t.amount as amount,
+        t.create_date as createDate,
+        c.phone as phone,
+        if(t.trading_status = 'success', '成功','失败') as tradingStatus,
         "红包" as consumeType,
         d.`name` as activityName
         From ta_org_order t
@@ -163,10 +152,7 @@
         left join ta_person c on a.receiver_id = c.person_id
         left join ta_drainage d on a.target_id = d.drainage_id
         where
-        a.item_type = #{orderType}
-        <if test="orgId != null and orgId != ''">
-            and t.org_id = #{orgId}
-        </if>
+        a.item_type = #{itemType}
         <if test="tradeNo != null and tradeNo != ''">
             and t.trade_no like concat('%', #{tradeNo}, '%')
         </if>
@@ -182,9 +168,6 @@
         <if test="receivePhone != null and receivePhone != ''">
             and c.receivePhone like concat('%', #{receivePhone}, '%')
         </if>
-        <if test="itemType != null and itemType != ''">
-            and a.item_type = #{itemType}
-        </if>
         <if test="miniAppName != null and miniAppName != ''">
             and b.name like concat('%', #{miniAppName}, '%')
         </if>
@@ -471,4 +454,34 @@
         ORDER BY
             t.create_date DESC
     </select>
+
+    <select id="orderListByRefundExport" resultType="com.huiju.estateagents.redpack.entity.RefundOrder">
+        select
+        t.trade_no as tradeNo,
+        t.amount as amount,
+        b.name as miniAppName,
+        t.create_date as createDate,
+        d.audit_result as auditResult,
+        if(d.audit_status = 'checking', '未审核', if(d.audit_status = 'unAgree', '不同意','同意')) as auditStatus
+        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
+        left join ta_org_account_certificate c on t.order_id = c.order_id
+        left join ta_org_refund_application d on d.org_id = t.org_id
+        where
+        a.item_type = #{itemType}
+        <if test="tradeNo != null and tradeNo != ''">
+            and t.trade_no like concat('%', #{tradeNo}, '%')
+        </if>
+        <if test="startDate != null and startDate != ''">
+            and t.create_date > #{startDate}
+        </if>
+        <if test="endDate != null and endDate != ''">
+            and t.create_date &lt; #{endDate}
+        </if>
+        <if test="miniAppName != null and miniAppName != ''">
+            and b.name like concat('%', #{miniAppName}, '%')
+        </if>
+        GROUP BY t.order_id
+    </select>
 </mapper>