|
|
|
@@ -105,7 +105,6 @@ public class WxBillAllController extends BillBaseController { |
|
|
|
wxMerchant.setId(-1L); |
|
|
|
} |
|
|
|
} |
|
|
|
wxMerchant.setId(458559063314927616L); |
|
|
|
PageInfo<WxMerchant> merchantPage = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); |
|
|
|
if (null != merchantPage && null != merchantPage.getList() && merchantPage.getList().size() > 0 ) { |
|
|
|
List<WxMerchantBillVo> retList = new ArrayList<WxMerchantBillVo>(); |
|
|
|
@@ -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); |
|
|
|
|