| @@ -14,9 +14,11 @@ import com.iformall.domain.po.SysConfig; | |||||
| import com.iformall.domain.po.WxBillAction; | import com.iformall.domain.po.WxBillAction; | ||||
| import com.iformall.domain.po.WxAllBill; | import com.iformall.domain.po.WxAllBill; | ||||
| import com.iformall.domain.po.WxBillPayWay; | import com.iformall.domain.po.WxBillPayWay; | ||||
| import com.iformall.domain.po.WxCoupon; | |||||
| import com.iformall.domain.po.WxEnergyFees; | import com.iformall.domain.po.WxEnergyFees; | ||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.domain.po.WxUserDataRule; | import com.iformall.domain.po.WxUserDataRule; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.domain.vo.WxBillBad; | import com.iformall.domain.vo.WxBillBad; | ||||
| import com.iformall.domain.vo.WxBillExcelTemplate; | import com.iformall.domain.vo.WxBillExcelTemplate; | ||||
| import com.iformall.domain.vo.WxBillHotNotify; | import com.iformall.domain.vo.WxBillHotNotify; | ||||
| @@ -26,10 +28,12 @@ import com.iformall.domain.vo.WxMerchantBillVo; | |||||
| import com.iformall.enums.EnumBillAllType; | import com.iformall.enums.EnumBillAllType; | ||||
| import com.iformall.enums.EnumBillOweOrNearType; | import com.iformall.enums.EnumBillOweOrNearType; | ||||
| import com.iformall.enums.EnumBillStatus; | import com.iformall.enums.EnumBillStatus; | ||||
| import com.iformall.enums.EnumCouponType; | |||||
| import com.iformall.enums.EnumRentContractManageFeeType; | import com.iformall.enums.EnumRentContractManageFeeType; | ||||
| import com.iformall.enums.EnumYesOrNo; | import com.iformall.enums.EnumYesOrNo; | ||||
| import com.iformall.service.ExcelService; | import com.iformall.service.ExcelService; | ||||
| import com.iformall.service.SysConfigService; | import com.iformall.service.SysConfigService; | ||||
| import com.iformall.service.WxAllBillService; | |||||
| import com.iformall.service.WxBillActionService; | import com.iformall.service.WxBillActionService; | ||||
| import com.iformall.service.WxEnergyService; | import com.iformall.service.WxEnergyService; | ||||
| import com.iformall.service.WxFinanceService; | import com.iformall.service.WxFinanceService; | ||||
| @@ -61,11 +65,11 @@ import java.util.Map; | |||||
| */ | */ | ||||
| @RestController | @RestController | ||||
| @RequestMapping("wxBillAll") | @RequestMapping("wxBillAll") | ||||
| public class WxBillAllController extends BillBaseController { | |||||
| public class WxAllBillController extends BillBaseController { | |||||
| //@Autowired | //@Autowired | ||||
| //private WxBillAllService wxBillAllService; | //private WxBillAllService wxBillAllService; | ||||
| private Logger logger = LoggerFactory.getLogger(WxBillAllController.class); | |||||
| private Logger logger = LoggerFactory.getLogger(WxAllBillController.class); | |||||
| @Autowired | @Autowired | ||||
| WxPayAccountBillService wxPayAccountBillService; | WxPayAccountBillService wxPayAccountBillService; | ||||
| @@ -91,6 +95,9 @@ public class WxBillAllController extends BillBaseController { | |||||
| @Autowired | @Autowired | ||||
| WxEnergyService wxEnergyService; | WxEnergyService wxEnergyService; | ||||
| @Autowired | |||||
| WxAllBillService wxAllBillService; | |||||
| /** | /** | ||||
| * 商户账单汇总计费列表 | * 商户账单汇总计费列表 | ||||
| * @param wxMerchant | * @param wxMerchant | ||||
| @@ -207,35 +214,6 @@ public class WxBillAllController extends BillBaseController { | |||||
| if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { | if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { | ||||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | 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); | |||||
| // WxBillSum rentDepositSum = billAllHelper.getBillDepositSum(wxMerchant, starttime, enttime); | |||||
| // WxBillSum propertySum = billAllHelper.getBillPropertySum(wxMerchant, starttime, enttime); | |||||
| // WxBillSum propertyDepositSum = billAllHelper.getBillPropertyDepositSum(wxMerchant, starttime, enttime); | |||||
| // WxBillSum dailySum = billAllHelper.getBillDailySum(wxMerchant, starttime, enttime,null); | |||||
| // WxBillSum otherSum = billAllHelper.getBillOtherSum(wxMerchant, starttime, enttime); | |||||
| // WxBillSum otherDepositSum = billAllHelper.getBillOtherDepositSum(wxMerchant, starttime, enttime); | |||||
| // | |||||
| // vo.setNeedPay(billAllHelper.calcuteSum(rentSum.getNeedPay(),rentBussinessManageSum.getNeedPay(),rentOperationManageSum.getNeedPay(),rentDepositSum.getNeedPay(),propertySum.getNeedPay(), | |||||
| // propertyDepositSum.getNeedPay(),dailySum.getNeedPay(),otherSum.getNeedPay(),otherDepositSum.getNeedPay())); | |||||
| // vo.setPaid(billAllHelper.calcuteSum(rentSum.getPaid(),rentBussinessManageSum.getPaid(),rentOperationManageSum.getPaid(),rentDepositSum.getPaid(),propertySum.getPaid(), | |||||
| // propertyDepositSum.getPaid(),dailySum.getPaid(),otherSum.getPaid(),otherDepositSum.getPaid())); | |||||
| // vo.setOwe(billAllHelper.calcuteSum(rentSum.getOwe(),rentBussinessManageSum.getOwe(),rentOperationManageSum.getOwe(),rentDepositSum.getOwe(),propertySum.getOwe(), | |||||
| // propertyDepositSum.getOwe(),dailySum.getOwe(),otherSum.getOwe(),otherDepositSum.getOwe())); | |||||
| // | |||||
| // List<WxBillSum> sumlist = new ArrayList<>(); | |||||
| // sumlist.add(rentSum); | |||||
| // sumlist.add(rentBussinessManageSum); | |||||
| // sumlist.add(rentOperationManageSum); | |||||
| // sumlist.add(rentDepositSum); | |||||
| // sumlist.add(propertySum); | |||||
| // sumlist.add(propertyDepositSum); | |||||
| // sumlist.add(dailySum); | |||||
| // sumlist.add(otherSum); | |||||
| // sumlist.add(otherDepositSum); | |||||
| // vo.setBillSumList(sumlist); | |||||
| return new ResultData(vo); | return new ResultData(vo); | ||||
| } | } | ||||
| @@ -278,6 +256,19 @@ public class WxBillAllController extends BillBaseController { | |||||
| return new ResultData(tmap); | return new ResultData(tmap); | ||||
| } | } | ||||
| @ApiOperation("费用科目列表") | |||||
| @GetMapping("feesList") | |||||
| @ApiImplicitParams({ | |||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), | |||||
| }) | |||||
| public ResultData feesList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) { | |||||
| record.updateTenantInfo(getTenantInfo()); | |||||
| record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | |||||
| PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); | |||||
| return new ResultData(page); | |||||
| } | |||||
| /** | /** | ||||
| * 欠缴账单列表 | * 欠缴账单列表 | ||||
| @@ -631,5 +622,51 @@ public class WxBillAllController extends BillBaseController { | |||||
| } | } | ||||
| return new ResultData(list); | return new ResultData(list); | ||||
| } | } | ||||
| @ApiOperation("分页列表接口") | |||||
| @GetMapping("list") | |||||
| @ApiImplicitParams({ | |||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | |||||
| public ResultData list(@ModelAttribute WxAllBill record, Integer pageNum, Integer pageSize,Boolean isList) { | |||||
| if (record == null) record = new WxAllBill(); | |||||
| record.updateTenantInfo(getTenantInfo()); | |||||
| WxUserDataRule dataRule = this.getCurrentDataFloors(); | |||||
| if (null != dataRule) { | |||||
| record.setFloorForRule(dataRule.getFloorIds()); | |||||
| record.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| } | |||||
| if (null != record.getOnlyOweOrNear()) { | |||||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { | |||||
| record.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays())); | |||||
| }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { | |||||
| record.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays())); | |||||
| record.setNearBillLastTime(billAllHelper.getDateBefore(getNearBillBeforeDays())); | |||||
| } | |||||
| } | |||||
| record.setSortColumns("status asc, starttime asc , merchant_id desc"); | |||||
| return new ResultData(wxAllBillService.listAsPage(record, pageNum, pageSize)); | |||||
| } | |||||
| @GetMapping("exportBill") | |||||
| public void exportBill(@ModelAttribute WxAllBill wxBillRent, HttpServletRequest request, HttpServletResponse response) { | |||||
| wxBillRent.updateTenantInfo(getTenantInfo()); | |||||
| WxUserDataRule dataRule = this.getCurrentDataFloors(); | |||||
| if (null != dataRule) { | |||||
| wxBillRent.setFloorForRule(dataRule.getFloorIds()); | |||||
| wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| } | |||||
| if (null != wxBillRent.getOnlyOweOrNear()) { | |||||
| if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { | |||||
| wxBillRent.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays())); | |||||
| }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { | |||||
| wxBillRent.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays())); | |||||
| wxBillRent.setNearBillLastTime(billAllHelper.getDateBefore(getNearBillBeforeDays())); | |||||
| } | |||||
| } | |||||
| wxAllBillService.exportBill(request, response, wxBillRent); | |||||
| } | |||||
| } | } | ||||
| @@ -202,7 +202,7 @@ public interface WxMerchantService { | |||||
| Map<String, Object> detailByShopId(TenantEntity tenantInfo, Long shopId); | Map<String, Object> detailByShopId(TenantEntity tenantInfo, Long shopId); | ||||
| List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel ) ; | |||||
| List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel ,String shopNumber) ; | |||||
| List<WxMerchantVo> findMerchantListByProduct(TenantEntity tenantEntity,Long productId,boolean hasShop); | List<WxMerchantVo> findMerchantListByProduct(TenantEntity tenantEntity,Long productId,boolean hasShop); | ||||
| @@ -627,7 +627,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { | |||||
| @Override | @Override | ||||
| public PageInfo<PageMerchantMicroPayVO> pageMerchantMicroPay(PageMerchantMicroPayDTO dto) { | public PageInfo<PageMerchantMicroPayVO> pageMerchantMicroPay(PageMerchantMicroPayDTO dto) { | ||||
| if (null != dto.getFloorForRule()) { | if (null != dto.getFloorForRule()) { | ||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0); | |||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0,null); | |||||
| if (null == mids || mids.size() <= 0 ) { | if (null == mids || mids.size() <= 0 ) { | ||||
| dto.setMerchantId(-1L); | dto.setMerchantId(-1L); | ||||
| }else { | }else { | ||||
| @@ -649,7 +649,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { | |||||
| @Override | @Override | ||||
| public void exportMerchantMicroPay(PageMerchantMicroPayDTO dto, HttpServletResponse response) { | public void exportMerchantMicroPay(PageMerchantMicroPayDTO dto, HttpServletResponse response) { | ||||
| if (null != dto.getFloorForRule()) { | if (null != dto.getFloorForRule()) { | ||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0); | |||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0,null); | |||||
| if (null == mids || mids.size() <= 0 ) { | if (null == mids || mids.size() <= 0 ) { | ||||
| dto.setMerchantId(-1L); | dto.setMerchantId(-1L); | ||||
| }else { | }else { | ||||
| @@ -106,8 +106,8 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill | |||||
| WxRentContractMapper wxRentContractMapper; | WxRentContractMapper wxRentContractMapper; | ||||
| private void updateQueryParam(WxAllBill wxBillRent) { | private void updateQueryParam(WxAllBill wxBillRent) { | ||||
| if (null != wxBillRent.getFloorForRule() || null != wxBillRent.getFloor() || null != wxBillRent.getBuilding()) { | |||||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRent, wxBillRent.getFloorForRule(), wxBillRent.getBuilding(), wxBillRent.getFloor(), 0, 0); | |||||
| if (StringUtils.isNotBlank(wxBillRent.getShopNumber()) || null != wxBillRent.getFloorForRule() || null != wxBillRent.getFloor() || null != wxBillRent.getBuilding()) { | |||||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRent, wxBillRent.getFloorForRule(), wxBillRent.getBuilding(), wxBillRent.getFloor(), 0, 0,wxBillRent.getShopNumber()); | |||||
| if (null != merchantIds) { | if (null != merchantIds) { | ||||
| wxBillRent.setMerchantIdList(merchantIds); | wxBillRent.setMerchantIdList(merchantIds); | ||||
| }else { | }else { | ||||
| @@ -790,7 +790,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| if (!StringUtils.isBlank(floorId)) { | if (!StringUtils.isBlank(floorId)) { | ||||
| floor = Long.parseLong(floorId); | floor = Long.parseLong(floorId); | ||||
| } | } | ||||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(tenantEntity, null, building, floor, 0, 0); | |||||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(tenantEntity, null, building, floor, 0, 0,null); | |||||
| if (merchantIds != null) { | if (merchantIds != null) { | ||||
| query.put("ids", merchantIds); | query.put("ids", merchantIds); | ||||
| } | } | ||||
| @@ -212,7 +212,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| @Override | @Override | ||||
| public PageInfo<WxMerchantVo> listAsPageCVo(WxMerchantDto wxMerchantDto, Integer pageIndex, Integer pageSize,boolean hasShop) { | public PageInfo<WxMerchantVo> listAsPageCVo(WxMerchantDto wxMerchantDto, Integer pageIndex, Integer pageSize,boolean hasShop) { | ||||
| if (null != wxMerchantDto.getBuilding() || null != wxMerchantDto.getFloor()) { | if (null != wxMerchantDto.getBuilding() || null != wxMerchantDto.getFloor()) { | ||||
| List<Long> merchantIds = getFloorBuildMerchantIds(wxMerchantDto, null, wxMerchantDto.getBuilding(), wxMerchantDto.getFloor(), null, null); | |||||
| List<Long> merchantIds = getFloorBuildMerchantIds(wxMerchantDto, null, wxMerchantDto.getBuilding(), wxMerchantDto.getFloor(), null, null,null); | |||||
| wxMerchantDto.setIds(merchantIds); | wxMerchantDto.setIds(merchantIds); | ||||
| } | } | ||||
| if(wxMerchantDto.getIsAdmin() == null){ | if(wxMerchantDto.getIsAdmin() == null){ | ||||
| @@ -1308,12 +1308,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| private List<Long> getFloorBuildingMerchantIds(TenantEntity tenantEntity,String floorForRule,Long buildingId,Long floor) { | private List<Long> getFloorBuildingMerchantIds(TenantEntity tenantEntity,String floorForRule,Long buildingId,Long floor) { | ||||
| String floorRule = StringUtils.trimToNull(floorForRule); | String floorRule = StringUtils.trimToNull(floorForRule); | ||||
| List<Long> floorMerchantIds = getFloorBuildMerchantIds(tenantEntity, floorRule, buildingId, floor, 0, 0); | |||||
| List<Long> floorMerchantIds = getFloorBuildMerchantIds(tenantEntity, floorRule, buildingId, floor, 0, 0,null); | |||||
| return floorMerchantIds; | return floorMerchantIds; | ||||
| } | } | ||||
| @Override | @Override | ||||
| public List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel ) { | |||||
| public List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel,String shopNumber ) { | |||||
| if (null != floorRule || null != building || null != floor) { | if (null != floorRule || null != building || null != floor) { | ||||
| List<Long> floorMerchantIds = null; | List<Long> floorMerchantIds = null; | ||||
| WxShop shopQ = new WxShop(); | WxShop shopQ = new WxShop(); | ||||
| @@ -1330,6 +1330,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| if (null != floor) { | if (null != floor) { | ||||
| shopQ.setFloor(floor); | shopQ.setFloor(floor); | ||||
| } | } | ||||
| shopQ.setShopNumber(shopNumber); | |||||
| List<Long> shopIds = wxShopMapper.findIdList(shopQ); | List<Long> shopIds = wxShopMapper.findIdList(shopQ); | ||||
| if (null == shopIds || shopIds.size() <= 0) { | if (null == shopIds || shopIds.size() <= 0) { | ||||
| floorMerchantIds = new ArrayList<Long>(); | floorMerchantIds = new ArrayList<Long>(); | ||||
| @@ -185,7 +185,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ | |||||
| private void handleQueryParam(WxMerchantTradeDaily record) { | private void handleQueryParam(WxMerchantTradeDaily record) { | ||||
| //楼层楼座 | //楼层楼座 | ||||
| List<Long> floorMids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuildingId(), record.getFloorId(), EnumYesOrNo.NO.getCode(), EnumYesOrNo.NO.getCode()); | |||||
| List<Long> floorMids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuildingId(), record.getFloorId(), EnumYesOrNo.NO.getCode(), EnumYesOrNo.NO.getCode(),null); | |||||
| if (null != floorMids || StringUtils.isNotBlank(record.getMerchantName())) { | if (null != floorMids || StringUtils.isNotBlank(record.getMerchantName())) { | ||||
| WxMerchant m = new WxMerchant(); | WxMerchant m = new WxMerchant(); | ||||
| m.updateTenantInfo(record); | m.updateTenantInfo(record); | ||||
| @@ -99,7 +99,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| @Override | @Override | ||||
| public PageInfo<WxPropertyContract> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxPropertyContract> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { | ||||
| if (StringUtils.isNotBlank(record.getFloorForRule())) { | if (StringUtils.isNotBlank(record.getFloorForRule())) { | ||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0); | |||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0,null); | |||||
| if (null == mids || mids.size() <= 0 ) { | if (null == mids || mids.size() <= 0 ) { | ||||
| record.setId(-1L); | record.setId(-1L); | ||||
| } else { | } else { | ||||
| @@ -1590,7 +1590,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| @Override | @Override | ||||
| public PageInfo<WxRentContract> getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { | public PageInfo<WxRentContract> getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { | ||||
| if (StringUtils.isNoneBlank(rentContract.getFloorForRule())) { | if (StringUtils.isNoneBlank(rentContract.getFloorForRule())) { | ||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null, 0, 0); | |||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null, 0, 0,null); | |||||
| if (null == mids || mids.size() <= 0 ) { | if (null == mids || mids.size() <= 0 ) { | ||||
| rentContract.setId(-1L); | rentContract.setId(-1L); | ||||
| } else { | } else { | ||||
| @@ -58,7 +58,7 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract | |||||
| @Override | @Override | ||||
| public PageInfo<WxRentPropertyContractVo> listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxRentPropertyContractVo> listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) { | ||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0); | |||||
| List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0,null); | |||||
| if (null == mids || mids.size() <= 0 ) { | if (null == mids || mids.size() <= 0 ) { | ||||
| record.setId(-1L); | record.setId(-1L); | ||||
| } else { | } else { | ||||