diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java index a47e1d20b..8e9ff4fee 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java @@ -157,4 +157,21 @@ public class WxShopController extends BaseController { wxShopService.exportNotRentShop(wxShop, request, response); } + @ApiOperation("未出租商铺分页列表接口") + @GetMapping("notRentShopList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "未出租商铺分页列表接口") + public ResultData notRentShopList(@ModelAttribute WxShop wxShop, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxShopController::notRentShopList"); + if (null == wxShop){ + wxShop = new WxShop(); + } + wxShop.setTenantId(getTenantId()); + wxShop.setSortColumns(WxShop.Field.Id_DESC); + + final PageInfo> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); + return new ResultData(page); + } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index c69d8e01f..5e98cef25 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -14,9 +14,10 @@ public interface WxShopMapper extends CommonMapper { List findList(WxShop wxShop); - List> findListMap(WxShop record); + List> notRentListMapAsPage(WxShop record); + List> getbshoplist(Map tenantId); Map getMerchantShopByShopId(Map params); diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index ec89fc18f..982224fb8 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -21,6 +21,8 @@ public interface WxShopService { PageInfo> listMapAsPage(WxShop record, Integer pageIndex, Integer pageSize); + PageInfo> notRentListMapAsPage(WxShop record, Integer pageIndex, Integer pageSize); + /** * 根据Id获得实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 7a779e55d..4dda956b2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2250,6 +2250,7 @@ public class WxChartServiceImpl implements WxChartDataService { private ResultData getIndexShopRentData(String tenantId, String startDateStr) { HashMap datamap = new HashMap<>(); Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd HH:mm:ss").getTime(); + startDate = DateUtils.getFirstDayForCurrMonth(startDate); Date endDate = DateUtils.getLastDayForMonth(startDate); WxShop query = new WxShop(); query.setTenantId(tenantId); @@ -2299,6 +2300,7 @@ public class WxChartServiceImpl implements WxChartDataService { private ResultData getBillReceRate(String tenantId, String startDateStr) { HashMap datamap = new HashMap<>(); Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd HH:mm:ss").getTime(); + startDate = DateUtils.getFirstDayForCurrMonth(startDate); Date endDate = DateUtils.getLastDayForMonth(startDate); //租金收缴率 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 58d47e903..100d70217 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -55,6 +55,14 @@ public class WxShopServiceImpl implements WxShopService { return pageInfo; } + @Override + public PageInfo> notRentListMapAsPage(WxShop record, Integer pageIndex, Integer pageSize) { + PageHelper.startPage(pageIndex, pageSize); + List> shops = wxShopMapper.notRentListMapAsPage(record); + PageInfo> pageInfo = new PageInfo<>(shops); + return pageInfo; + } + @Override public WxShop getById(Long id) { return wxShopMapper.selectByPrimaryKey(id); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index d21978d49..6a1a3de36 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -267,6 +267,43 @@ +