Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
0f26019a3f
3 changed files with 5 additions and 2 deletions
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java
  3. +1
    -0
      mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java View File

@@ -212,5 +212,7 @@ public class WxBillRentManage extends TenantEntity {
@TableField(exist = false)
private List<Long> merchantIds;
@TableField(exist = false)
private Integer hasMerchant;

}

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java View File

@@ -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<WxBillRentManage> billRentList = getBillRentManageList(1, 10000, wxBillRentManage, wxPayAccountBill);
List<WxBillRentManage> datalist = new ArrayList<>();
if (null != billRentList && null != billRentList.getList()) {


+ 1
- 0
mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml View File

@@ -115,6 +115,7 @@
<if test=" null != starttime and null!=endtime ">and br.`receive_date` between #{starttime} and #{endtime}
</if>
<if test=" null != manageFeeType ">and br.`manage_fee_type` = #{manageFeeType}</if>
<if test=" null != hasMerchant ">and br.`merchant_id` is not null</if>
<if test=" null != merchantIds ">
and br.merchant_id in


Loading…
Cancel
Save