From 0f26019a3f74aab5132dd398bf3c3ac3a0adb401 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 21 Apr 2024 16:56:24 +0800 Subject: [PATCH] fix --- .../main/java/com/iformall/domain/po/WxBillRentManage.java | 2 ++ .../iformall/service/impl/WxBillRentManageServiceImpl.java | 4 ++-- .../src/main/resources/mapper/WxBillRentManageMapper.xml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java index b10b3aaff..04b7e1ad9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java @@ -212,5 +212,7 @@ public class WxBillRentManage extends TenantEntity { @TableField(exist = false) private List merchantIds; + @TableField(exist = false) + private Integer hasMerchant; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java index 7b7d31291..d0c2319ab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java @@ -384,11 +384,11 @@ public class WxBillRentManageServiceImpl implements WxBillRentManageService { } @Override - public void exportBill(HttpServletRequest request, HttpServletResponse response, - WxBillRentManage wxBillRentManage) { + public void exportBill(HttpServletRequest request, HttpServletResponse response,WxBillRentManage wxBillRentManage) { WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillRentManage); String billName = wxBillRentManage.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺租金账单" : "多经点位租金账单"; + wxBillRentManage.setHasMerchant(EnumYesOrNo.YES.getCode()); PageInfo billRentList = getBillRentManageList(1, 10000, wxBillRentManage, wxPayAccountBill); List datalist = new ArrayList<>(); if (null != billRentList && null != billRentList.getList()) { diff --git a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml index dd027c28e..1ca905043 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml @@ -115,6 +115,7 @@ and br.`receive_date` between #{starttime} and #{endtime} and br.`manage_fee_type` = #{manageFeeType} + and br.`merchant_id` is not null and br.merchant_id in