bug fix

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

@@ -74,12 +74,14 @@ public class TaOrgOrderController extends BaseController {
                                        @RequestParam(value = "itemType", required = false) String itemType,
                                        @RequestParam(value = "startDate", required = false) String startDate,
                                        @RequestParam(value = "endDate", required = false) String endDate,
+                                       @RequestParam(value = "payStartDate", required = false) String payStartDate,
+                                       @RequestParam(value = "payEndDate", required = false) String payEndDate,
                                        @RequestParam(value = "auditStatus", required = false) String auditStatus) {
         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, miniAppName, auditStatus);
+            IPage<TaOrgOrder> result = iTaOrgOrderService.listByCondition(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, receivePhone, itemType, startDate, endDate, miniAppName, auditStatus, payStartDate, payEndDate);
             responseBean.addSuccess(result);
         } catch (Exception e) {
             e.printStackTrace();
@@ -137,7 +139,7 @@ public class TaOrgOrderController extends BaseController {
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=订单统计.xlsx");
 
-        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), RechargeOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ConsumeOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
 
         // 设置 sheet, 同一个sheet只需要设置一次

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

@@ -37,6 +37,13 @@ public class ConsumeOrder {
     @ExcelProperty(value = "消费方式", index = 3)
     private String consumeType;
 
+    /**
+     * 活动名称
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "活动名称", index = 4)
+    private String activityName;
+
     /**
      * 消费下单时间
      */

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

@@ -44,7 +44,9 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                                   @Param("startDate") String startDate,
                                                   @Param("endDate") String endDate,
                                                   @Param("miniAppName") String miniAppName,
-                                                  @Param("auditStatus") String auditStatus);
+                                                  @Param("auditStatus") String auditStatus,
+                                                  @Param("payStartDate") String payStartDate,
+                                                  @Param("payEndDate") String payEndDate);
 
     /**
      * 消费订单

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

@@ -51,7 +51,7 @@ 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, String startDate, String endDate, String miniAppName, String auditStatus);
+    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, String auditStatus, String payStartDate, String payEndDate);
 
     /**
      * 充值订单列表导出

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

@@ -102,12 +102,25 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     private ITaOrgAccountService taOrgAccountService;
 
     @Override
-    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, String auditStatus) {
+    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,
+                                             String auditStatus,
+                                             String payStartDate,
+                                             String payEndDate) {
         IPage<TaOrgOrder> result = pg;
 
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
             List<String> urlList = new ArrayList<>();
-            result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, auditStatus);
+            result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, auditStatus, payStartDate, payEndDate);
             result.getRecords().forEach(e -> {
                 e.setCertificateUrlList(getCertificateByOrderId(e.getOrderId()));
             });

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

@@ -8,7 +8,9 @@
         d.name as orgName,
         c.channel_proxy_name,
         t.purchase_amount,
-        total_refund
+        total_refund,
+        t.account_id,
+        t.org_id
         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

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

@@ -45,10 +45,16 @@
             and d.audit_status = #{auditStatus}
         </if>
         <if test="startDate != null and startDate != ''">
-            and t.create_date > #{startDate}
+            and t.create_date >= #{startDate}
         </if>
         <if test="endDate != null and endDate != ''">
-            and t.create_date &lt; #{endDate}
+            and t.create_date &lt;= #{endDate}
+        </if>
+        <if test="payStartDate != null and payStartDate != ''">
+            and t.pay_date >= #{payStartDate}
+        </if>
+        <if test="payEndDate != null and payEndDate != ''">
+            and t.pay_date &lt;= #{payEndDate}
         </if>
         <if test="miniAppName != null and miniAppName != ''">
             and b.name like concat('%', #{miniAppName}, '%')
@@ -158,7 +164,7 @@
         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
+        left join ta_red_packet d on a.target_id = d.activity_id
         where
         a.item_type = #{itemType}
         <if test="tradeNo != null and tradeNo != ''">