新需求

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

@@ -865,7 +865,7 @@ public class CommConstant {
     /**
      * 明细类型--红包
      */
-    public static final String ITEM_TYPE_REDPACKAGE = "redPackage";
+    public static final String ITEM_TYPE_REDPACKAGE = "redPacket";
 
     /**
      * 交易状态 成功

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

@@ -9,6 +9,8 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.redpack.entity.TaOrgAccount;
 import com.huiju.estateagents.redpack.entity.TaOrgOrder;
 import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountBlockedMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
 import com.huiju.estateagents.redpack.service.ITaOrgAccountService;
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
 import lombok.extern.slf4j.Slf4j;
@@ -40,6 +42,12 @@ public class TaOrgAccountController extends BaseController {
     @Autowired
     public ITaOrgOrderService iTaOrgOrderService;
 
+    @Autowired
+    public TaOrgOrderMapper taOrgOrderMapper;
+
+    @Autowired
+    public TaOrgAccountBlockedMapper taOrgAccountBlockedMapper;
+
     /**
      * 分页查询列表
      *
@@ -47,7 +55,7 @@ public class TaOrgAccountController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/taOrgAccount", method = RequestMethod.GET)
+    @RequestMapping(value = "/channel/taOrgAccount", method = RequestMethod.GET)
     public ResponseBean taOrgAccountList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                          @RequestParam(value = "miniAppName", required = false) String miniAppName) {
@@ -56,11 +64,22 @@ public class TaOrgAccountController extends BaseController {
             //使用分页插件
             IPage<TaOrgAccount> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaOrgAccount> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq(!StringUtils.isEmpty(miniAppName), "miniapp_name", miniAppName);
+            queryWrapper.like(!StringUtils.isEmpty(miniAppName), "miniapp_name", miniAppName);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaOrgAccount> result = iTaOrgAccountService.page(pg, queryWrapper);
+            result.getRecords().forEach(e -> {
+                Integer totalRechargeAmount = taOrgOrderMapper.countTotalRechargeAmount(e.getOrgId());
+                e.setTotalRechargeAmount(totalRechargeAmount);
+                //查询退款冻结额
+                Integer totalBlockAmount = taOrgAccountBlockedMapper.countTotalBlockAmount(e.getOrgId());
+
+                //账户余额=总充值金额-已消费金额-已退款额-退款冻结额
+                Integer balance = totalRechargeAmount - e.getPurchaseAmount() - e.getTotalRefund() - totalBlockAmount;
+                e.setRealBalance(balance);
+            });
             responseBean.addSuccess(result);
+
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taOrgAccountList -=- {}", e.toString());

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

@@ -1,18 +1,24 @@
 package com.huiju.estateagents.redpack.controller;
 
+import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,7 +32,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.excel.ActivityStatistics.VisitPersonNum;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+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.service.ITaOrgOrderService;
 import com.huiju.estateagents.service.ITaPersonService;
@@ -68,14 +80,15 @@ public class TaOrgOrderController extends BaseController {
                                        @RequestParam(value = "isOffline", required = false) Integer isOffline,
                                        @RequestParam(value = "tradingStatus", required = false) String tradingStatus,
                                        @RequestParam(value = "receivePhone", required = false) String receivePhone,
+                                       @RequestParam(value = "miniAppName", required = false) String miniAppName,
                                        @RequestParam(value = "itemType", required = false) String itemType,
-                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
-                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate) {
+                                       @RequestParam(value = "startDate", required = false) String startDate,
+                                       @RequestParam(value = "endDate", required = false) String endDate) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
-            IPage<TaOrgOrder> result = iTaOrgOrderService.listByCondition(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, receivePhone, itemType, startDate, endDate);
+            IPage<TaOrgOrder> result = iTaOrgOrderService.listByCondition(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, receivePhone, itemType, startDate, endDate, miniAppName);
             responseBean.addSuccess(result);
         } catch (Exception e) {
             e.printStackTrace();
@@ -85,6 +98,42 @@ public class TaOrgOrderController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 订单导出
+     * @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,
+                                                   @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,
+                                                   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();
+        }
+
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+        List<TaOrgOrder> data = iTaOrgOrderService.listByConditionExport(orderType, orgId, tradeNo, isOffline, tradingStatus, receivePhone, itemType, startDate, endDate, miniAppName);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
     /**
      * 保存对象
      *

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

@@ -0,0 +1,61 @@
+package com.huiju.estateagents.redpack.entity;
+
+import java.time.LocalDateTime;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+
+import lombok.Data;
+
+@Data
+public class ConsumeOrder {
+    /**
+     * 订单编号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "订单编号", index = 0)
+    private String tradeNo;
+
+    /**
+     * 消费组织
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费组织", index = 1)
+    private String miniAppName;
+
+    /**
+     * 消费金额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费金额", index = 2)
+    private Integer amount;
+
+    /**
+     * 消费方式
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费方式", index = 3)
+    private String consumeType;
+
+    /**
+     * 消费下单时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费下单时间", index = 5)
+    private LocalDateTime createDate;
+
+    /**
+     * 接收人手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "接收人手机号", index = 6)
+    private String phone;
+
+    /**
+     * 消费状态
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费状态", index = 7)
+    private String tradingStatus;
+
+}

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

@@ -0,0 +1,60 @@
+package com.huiju.estateagents.redpack.entity;
+
+import java.time.LocalDateTime;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+
+import lombok.Data;
+
+@Data
+public class RechargeOrder {
+    /**
+     * 订单编号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "订单编号", index = 0)
+    private String tradeNo;
+
+    /**
+     * 充值组织
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值组织", index = 1)
+    private String miniAppName;
+
+    /**
+     * 充值金额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值金额", index = 2)
+    private Integer amount;
+
+    /**
+     * 充值方式
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值方式", index = 3)
+    private String isOffline;
+
+    /**
+     * 下单时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "下单时间", index = 4)
+    private LocalDateTime createDate;
+
+    /**
+     * 充值状态
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值状态", index = 5)
+    private String tradingStatus;
+
+    /**
+     * 支付时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "支付时间", index = 6)
+    private LocalDateTime payDate;
+}

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

@@ -0,0 +1,54 @@
+package com.huiju.estateagents.redpack.entity;
+
+import java.time.LocalDateTime;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+
+import lombok.Data;
+
+@Data
+public class RefundOrder {
+    /**
+     * 订单编号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "订单编号", index = 0)
+    private String tradeNo;
+
+    /**
+     * 退款组织
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款组织", index = 1)
+    private String miniAppName;
+
+    /**
+     * 退款金额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款金额", index = 2)
+    private Integer amount;
+
+    /**
+     * 退款创建时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款创建时间", index = 3)
+    private LocalDateTime createDate;
+
+    /**
+     * 退款状态
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款状态", index = 4)
+    private String auditStatus;
+
+    /**
+     * 驳回原因
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "驳回原因", index = 5)
+    private String auditResult;
+
+}

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

@@ -106,6 +106,18 @@ public class TaOrgAccount implements Serializable {
     /**
      * 代理商名称
      */
+    @TableField(exist = false)
     private String channelProxyName;
 
+    /**
+     * 总充值金额
+     */
+    @TableField(exist = false)
+    private Integer totalRechargeAmount;
+
+    /**
+     * 公司/组织名称
+     */
+    @TableField(exist = false)
+    private String orgName;
 }

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

@@ -131,5 +131,15 @@ public class TaOrgOrder implements Serializable {
     @TableField(exist = false)
     private String avatarurl;
 
+    /**
+     * 消费方式
+     */
+    @TableField(exist = false)
+    private String consumeType;
 
+    /**
+     * 活动名称
+     */
+    @TableField(exist = false)
+    private String activityName;
 }

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

@@ -36,8 +36,9 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                                   @Param("tradeNo") String tradeNo,
                                                   @Param("isOffline") Integer isOffline,
                                                   @Param("tradingStatus") String tradingStatus,
-                                                  @Param("startDate") LocalDate startDate,
-                                                  @Param("endDate") LocalDate endDate);
+                                                  @Param("startDate") String startDate,
+                                                  @Param("endDate") String endDate,
+                                                  @Param("miniAppName") String miniAppName);
 
     /**
      * 消费订单
@@ -54,8 +55,41 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                          @Param("tradingStatus") String tradingStatus,
                                          @Param("receivePhone") String receivePhone,
                                          @Param("itemType") String itemType,
-                                         @Param("startDate") LocalDate startDate,
-                                         @Param("endDate") LocalDate endDate);
+                                         @Param("startDate") String startDate,
+                                         @Param("endDate") String endDate,
+                                         @Param("miniAppName") String miniAppName);
+
+    /**
+     * 充值退款订单导出
+     *
+     * @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);
+
+    /**
+     * 消费订单导出
+     *
+     * @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);
 
     /**
      * 获取充值订单列表

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

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

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

@@ -48,7 +48,15 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param orderType
      * @return
      */
-    IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, LocalDate startDate, LocalDate endDate);
+    IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, 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);
 
     /**
      * 微信支付

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

@@ -187,7 +187,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
     }
 
     @Override
-    public ResponseBean getOrgAccountById(Integer orgId) {
+    public TaOrgAccount getOrgAccountById(Integer orgId) {
         ResponseBean responseBean = new ResponseBean<>();
         TaOrgAccount taOrgAccount = taOrgAccountMapper.getOrgAccountById(orgId);
 
@@ -201,8 +201,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         Integer balance = totalRechargeAmount - taOrgAccount.getPurchaseAmount() - taOrgAccount.getTotalRefund() - totalBlockAmount;
         taOrgAccount.setRealBalance(balance);
 
-        responseBean.addSuccess(taOrgAccount);
-        return responseBean;
+        return taOrgAccount;
     }
 
     @Override

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

@@ -83,17 +83,31 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     private TaWxPayConfigMapper taWxPayConfigMapper;
 
     @Override
-    public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, LocalDate startDate, LocalDate endDate) {
-        IPage<TaOrgOrder> result = null;
+    public 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) {
+        IPage<TaOrgOrder> result = pg;
 
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
-            result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate);
+            result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
             return result;
         } else if (CommConstant.ITEM_TYPE_REDPACKAGE.equals(orderType)) {
-            result = taOrgOrderMapper.orderListByConsume(pg, orderType, orgId, tradeNo, tradingStatus, receivePhone, itemType, startDate, endDate);
+            result = taOrgOrderMapper.orderListByConsume(pg, orderType, orgId, tradeNo, tradingStatus, receivePhone, itemType, startDate, endDate, miniAppName);
             return result;
         } else {
-            return null;
+            return result;
+        }
+    }
+
+    @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;
         }
     }
 

src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java

@@ -52,7 +52,7 @@ public class TaContactController extends BaseController {
     @RequestMapping(value = "/channel/listContactByCondition", method = RequestMethod.GET)
     public ResponseBean listContactByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                               String contactName, String telephone, String phone, String job) {
+                                               String contactName, String telephone, String phone, String job, String contactType) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -62,6 +62,7 @@ public class TaContactController extends BaseController {
             queryWrapper.like(!StringUtils.isEmpty(telephone), "telephone", telephone);
             queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
             queryWrapper.like(!StringUtils.isEmpty(job), "job", job);
+            queryWrapper.eq(!StringUtils.isEmpty(contactType), "contact_type", contactType);
             queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("order_no", "create_date");
 

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.redpack.mapper.TaOrgAccountBlockedMapper">
 
     <select id="countTotalBlockAmount" resultType="java.lang.Integer">
-        select sum(t.blocked_balance) from ta_org_account_blocked t
+        select ifnull(sum(t.blocked_balance), 0) from ta_org_account_blocked t
         where t.org_id = #{orgId}
     </select>
 

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

@@ -5,12 +5,14 @@
     <select id="getOrgAccountById" resultType="com.huiju.estateagents.redpack.entity.TaOrgAccount">
         select
         t.miniapp_name,
+        d.name as orgName,
         c.channel_proxy_name,
         t.purchase_amount,
         total_refund
         From ta_org_account  t
         left join ta_channel_app_relation b on t.org_id = b.org_id
         left join ta_channel_proxy c on b.channel_id = c.channel_id
+        left join ta_org d on t.org_id = d.org_id
         where t.org_id = #{orgId}
     </select>
 

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

@@ -28,9 +28,9 @@
             and t.org_id = #{orgId}
         </if>
         <if test="tradeNo != null and tradeNo != ''">
-            and t.trade_no = #{tradeNo}
+            and t.trade_no like concat('%', #{tradeNo}, '%')
         </if>
-        <if test="isOffline != null and isOffline != ''">
+        <if test="isOffline != null">
             and t.is_offline = #{isOffline}
         </if>
         <if test="tradingStatus != null and tradingStatus != ''">
@@ -42,6 +42,9 @@
         <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>
 
@@ -52,11 +55,13 @@
         t.amount,
         t.create_date,
         c.phone,
-        t.trading_status
+        t.trading_status,
+        d.`name` as activityName
         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_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 != ''">
@@ -66,7 +71,98 @@
             and t.org_id = #{orgId}
         </if>
         <if test="tradeNo != null and tradeNo != ''">
-            and t.trade_no = #{tradeNo}
+            and t.trade_no like concat('%', #{tradeNo}, '%')
+        </if>
+        <if test="tradingStatus != null and tradingStatus != ''">
+            and t.trading_status = #{tradingStatus}
+        </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="receivePhone != null and receivePhone != ''">
+            and c.phone 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>
+        GROUP BY t.order_id
+    </select>
+
+    <select id="orderListByRechargeOrRefundExport" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
+        select
+        t.trade_no,
+        t.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
+        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>
+        <if test="tradeNo != null and tradeNo != ''">
+            and t.trade_no like concat('%', #{tradeNo}, '%')
+        </if>
+        <if test="isOffline != null and isOffline != ''">
+            and t.is_offline = #{isOffline}
+        </if>
+        <if test="tradingStatus != null ">
+            and t.trading_status = #{tradingStatus}
+        </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>
+
+    <select id="orderListByConsumeExport" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
+        select
+        t.trade_no,
+        b.name as miniAppName,
+        t.amount,
+        t.create_date,
+        c.phone,
+        t.trading_status,
+        "红包" as consumeType,
+        d.`name` as activityName
+        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_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>
+        <if test="tradeNo != null and tradeNo != ''">
+            and t.trade_no like concat('%', #{tradeNo}, '%')
         </if>
         <if test="tradingStatus != null and tradingStatus != ''">
             and t.trading_status = #{tradingStatus}
@@ -83,6 +179,9 @@
         <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>
         GROUP BY t.order_id
     </select>
 
@@ -219,7 +318,7 @@
     </select>
 
     <select id="countTotalRechargeAmount" resultType="java.lang.Integer">
-        select sum(t.amount) as amount from ta_org_order t
+        select ifnull(sum(t.amount),0) as amount from ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id where t.org_id = #{orgId}
         and a.item_type = 'recharge'
     </select>