diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 68d55de6a..2dfeb3918 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -105,7 +105,6 @@ public class WxBillAllController extends BillBaseController { wxMerchant.setId(-1L); } } - wxMerchant.setId(458559063314927616L); PageInfo merchantPage = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); if (null != merchantPage && null != merchantPage.getList() && merchantPage.getList().size() > 0 ) { List retList = new ArrayList(); @@ -190,6 +189,9 @@ public class WxBillAllController extends BillBaseController { vo.setMerchantName(m.getName()); vo.setShopNumber(billAllHelper.getMerchantShopNumber(m)); + if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { + wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); + } WxBillSum rentSum = billAllHelper.getBillRentSum(wxMerchant,starttime, enttime); WxBillSum rentBussinessManageSum = billAllHelper.getBillRentManageSum(wxMerchant, starttime, enttime,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE); WxBillSum rentOperationManageSum = billAllHelper.getBillRentManageSum(wxMerchant, starttime, enttime,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE);