diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java index 10cc3940f..89be25512 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java @@ -49,5 +49,13 @@ public class WxBillAllController extends BaseController wxBillAllService.exportBill(request,response,wxBillAll); } + @GetMapping("getBillInfo") + public ResultData getBillInfo(@ModelAttribute WxBillAll wxBillAll) { + wxBillAll.setTenantId(getTenantId()); + Object billInfo = wxBillAllService.getBillInfo(wxBillAll); + return new ResultData(billInfo); + } + + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java index de442ca90..fb3202146 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java @@ -35,7 +35,7 @@ public class WxBillPropertyController extends BaseController { wxBillProperty = new WxBillProperty(); } wxBillProperty.setTenantId(getTenantId()); - wxBillProperty.setSortColumns(WxBillProperty.Field.Id_ASC); + wxBillProperty.setSortColumns(WxBillProperty.Field.Id_DESC); PageInfo> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); return new ResultData(result); } @@ -84,4 +84,14 @@ public class WxBillPropertyController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", wxBillPropertyService.detail(id)); } + @GetMapping("/findByMerchantId") + @ApiImplicitParams({ + @ApiImplicitParam(name = "merchantId", value = "merchantId", dataType = "Long", paramType = "query", required = true), + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData findByMerchantId(Long merchantId, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::findByMerchantId"); + final PageInfo> page = wxBillPropertyService.findByMerchantId(merchantId, getTenantId(), pageNum, pageSize); + return new ResultData(page); + } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java index ab622e55c..d8fd78907 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java @@ -69,10 +69,14 @@ public class WxBillRentController extends BaseController { } @GetMapping("/findByMerchantId") - @ApiImplicitParam(name = "merchantId", value = "merchantId", dataType = "Long", paramType = "query", required = true) - public ResultData findByMerchantId(Long merchantId) { + @ApiImplicitParams({ + @ApiImplicitParam(name = "merchantId", value = "merchantId", dataType = "Long", paramType = "query", required = true), + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData findByMerchantId(Long merchantId, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxBillRentController::findByMerchantId"); - return new ResultData(Result.SUCCESS, "查询成功", wxBillRentService.findByMerchantId(merchantId)); + final PageInfo> page = wxBillRentService.findByMerchantId(merchantId, getTenantId(), pageNum, pageSize); + return new ResultData(page); } @GetMapping("/updatePaid") diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 8ef27a43d..270e5b0b0 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -23,4 +23,5 @@ public interface WxBillAllService { void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillAll wxBillAll); + Object getBillInfo(WxBillAll wxBillAll); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java index 15b00e202..5762d080c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java @@ -3,7 +3,6 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBillProperty; -import com.iformall.domain.po.WxBillRent; import java.util.Map; @@ -48,7 +47,7 @@ public interface WxBillPropertyService { void deleteById(Long id); - Object findByMerchantId(Long id); + PageInfo> findByMerchantId(Long id, String tenantId, Integer pageIndex, Integer pageSize); ResultData updatePaid(Long id); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index 75f0f8d60..3689e0f8e 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -45,7 +45,7 @@ public interface WxBillRentService { void deleteById(Long id); - Object findByMerchantId(Long id); + PageInfo> findByMerchantId(Long id, String tenantId, Integer pageIndex, Integer pageSize); ResultData updatePaid(Long id); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 74912aab4..28f8819d9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -85,20 +85,10 @@ public class WxBillAllServiceImpl implements WxBillAllService { public Map listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) { //更新各账单状态 updateBillStatus(record); - //得到当前月 - String month = DateUtils.getSystemTime("yyyy-MM"); - //获取账单信息-欠缴笔数、欠缴金额、结清笔数、结清金额 - Object billInfo = getBillInfo(record.getTenantId(), month); - //设置查询参数-当前月 - record.setMonth(month); - //分页-页数、条数 PageHelper.startPage(pageIndex, pageSize); - //查询 List> billList = wxBillAllMapper.list(record); PageInfo> pageInfo = new PageInfo<>(billList); - //返回值 Map result = new HashMap<>(); - result.put("billInfo", billInfo); result.put("pageInfo", pageInfo); return result; } @@ -498,10 +488,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { logger.info("更新各账单状态结束"); } - private Object getBillInfo(String tenantId, String month) { - WxBillAll record = new WxBillAll(); - record.setTenantId(tenantId); - record.setMonth(month); + @Override + public Object getBillInfo(WxBillAll record) { + record.setRentShopType(EnumRentShopType.SHOP.getCode()); record.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); Map oweInfoForShop = wxBillAllMapper.queryOweInfo(record); @@ -514,7 +503,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { record.setStatus(EnumBillRentStatus.PAID.getCode()); Map paidInfoForPoint = wxBillAllMapper.queryPaidInfo(record); - Map result = new HashMap<>(5); + Map result = new HashMap<>(4); result.put("oweInfoForShop", oweInfoForShop); result.put("paidInfoForShop", paidInfoForShop); result.put("oweInfoForPoint", oweInfoForPoint); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 4885e28d4..44f359078 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -146,13 +146,19 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { } @Override - public Object findByMerchantId(Long id) { + public PageInfo> findByMerchantId(Long id, String tenantId, Integer pageIndex, Integer pageSize) { WxBillProperty record = new WxBillProperty(); record.setMerchantId(id); + record.setTenantId(tenantId); record.setSortColumns(WxBillProperty.Field.Id_ASC); - return wxBillPropertyMapper.queryBillPropertyList(record); + updateBillStatus(record); + PageHelper.startPage(pageIndex, pageSize); + List> billRentList = wxBillPropertyMapper.queryBillPropertyList(record); + PageInfo> pageInfo = new PageInfo<>(billRentList); + return pageInfo; } + @Transactional(rollbackFor = {Exception.class}) @Override public ResultData updatePaid(Long id) { @@ -181,12 +187,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { WxBillPropertyDeposit depositParam = new WxBillPropertyDeposit(); depositParam.setPropertyContractId((Long) property.get("propertyContractId")); Map deposit = wxBillPropertyDepositMapper.queryBillDepositList(depositParam).get(0); - //周期 - Object weekly = findByMerchantId((Long) property.get("merchantId")); - Map result = new HashMap<>(3); + Map result = new HashMap<>(2); result.put("property", property); result.put("deposit", deposit); - result.put("weekly", weekly); return result; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 4ea2ef954..36911ae56 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -92,7 +92,6 @@ public class WxBillRentServiceImpl implements WxBillRentService { public Map getById(Long id) { WxBillRent record = new WxBillRent(); record.setId(id); - record.setSortColumns(WxBillRent.Field.Id_ASC); return wxBillRentMapper.queryBillRentList(record).get(0); } @@ -148,11 +147,16 @@ public class WxBillRentServiceImpl implements WxBillRentService { } @Override - public Object findByMerchantId(Long id) { + public PageInfo> findByMerchantId(Long id, String tenantId, Integer pageIndex, Integer pageSize) { WxBillRent record = new WxBillRent(); record.setMerchantId(id); + record.setTenantId(tenantId); record.setSortColumns(WxBillRent.Field.Id_ASC); - return wxBillRentMapper.queryBillRentList(record); + updateBillStatus(record); + PageHelper.startPage(pageIndex, pageSize); + List> billRentList = wxBillRentMapper.queryBillRentList(record); + PageInfo> pageInfo = new PageInfo<>(billRentList); + return pageInfo; } @Transactional(rollbackFor = {Exception.class}) @@ -184,11 +188,11 @@ public class WxBillRentServiceImpl implements WxBillRentService { depositParam.setRentContractId((Long) rent.get("rentContractId")); Map deposit = wxBillDepositMapper.queryBillDepositList(depositParam).get(0); //周期 - Object weekly = findByMerchantId((Long) rent.get("merchantId")); + //Object weekly = findByMerchantId((Long) rent.get("merchantId")); Map result = new HashMap<>(3); result.put("rent", rent); result.put("deposit", deposit); - result.put("weekly", weekly); + //result.put("weekly", weekly); return result; } diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index b3aca8622..ab5df12d1 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -100,7 +100,7 @@ and br.`rent_shop_type` = #{rentShopType} - order by br.${sortColumns} + order by br.${sortColumns}