From 848de99613cf4d600f49ecb8e27f76cbc621fcee Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 4 Mar 2019 17:58:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=91=A8=E6=9C=9F=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxBillPropertyController.java | 10 +++++----- .../com/iformall/controller/WxBillRentController.java | 10 +++++----- .../com/iformall/service/WxBillPropertyService.java | 2 +- .../java/com/iformall/service/WxBillRentService.java | 2 +- .../service/impl/WxBillPropertyServiceImpl.java | 4 ++-- .../iformall/service/impl/WxBillRentServiceImpl.java | 4 ++-- .../src/main/resources/mapper/WxBillPropertyMapper.xml | 2 +- .../src/main/resources/mapper/WxBillRentMapper.xml | 1 + 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java index 73c8e0a1f..fc7a4f291 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java @@ -84,14 +84,14 @@ public class WxBillPropertyController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", wxBillPropertyService.detail(id)); } - @GetMapping("/findByMerchantId") + @GetMapping("/findByPropertyContractId") @ApiImplicitParams({ - @ApiImplicitParam(name = "merchantId", value = "merchantId", dataType = "Long", paramType = "query", required = true), + @ApiImplicitParam(name = "propertyContractId", 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() + "] WxBillPropertyController::findByMerchantId"); - final PageInfo> page = wxBillPropertyService.findByMerchantId(merchantId, getTenantId(), pageNum, pageSize); + public ResultData findByPropertyContractId(Long propertyContractId, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyController::findByPropertyContractId"); + final PageInfo> page = wxBillPropertyService.findByPropertyContractId(propertyContractId, 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 ee3a6ab36..e01979027 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java @@ -68,14 +68,14 @@ public class WxBillRentController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", wxBillRentService.getById(id)); } - @GetMapping("/findByMerchantId") + @GetMapping("/findByRentContractId") @ApiImplicitParams({ - @ApiImplicitParam(name = "merchantId", value = "merchantId", dataType = "Long", paramType = "query", required = true), + @ApiImplicitParam(name = "rentContractId", 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 = wxBillRentService.findByMerchantId(merchantId, getTenantId(), pageNum, pageSize); + public ResultData findByRentContractId(Long rentContractId, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::findByRentContractId"); + final PageInfo> page = wxBillRentService.findByRentContractId(rentContractId, getTenantId(), pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java index 5762d080c..b194d6d32 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java @@ -47,7 +47,7 @@ public interface WxBillPropertyService { void deleteById(Long id); - PageInfo> findByMerchantId(Long id, String tenantId, Integer pageIndex, Integer pageSize); + PageInfo> findByPropertyContractId(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 f0906ec64..0c1192d09 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); - PageInfo> findByMerchantId(Long id, String tenantId, Integer pageIndex, Integer pageSize); + PageInfo> findByRentContractId(Long id, String tenantId, Integer pageIndex, Integer pageSize); ResultData updatePaid(Long id); 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 1256287a5..9deb14159 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -149,9 +149,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { } @Override - public PageInfo> findByMerchantId(Long id, String tenantId, Integer pageIndex, Integer pageSize) { + public PageInfo> findByPropertyContractId(Long id, String tenantId, Integer pageIndex, Integer pageSize) { WxBillProperty record = new WxBillProperty(); - record.setMerchantId(id); + record.setPropertyContractId(id); record.setTenantId(tenantId); record.setSortColumns(WxBillProperty.Field.Id_ASC); updateBillStatus(record); 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 703f399f7..ef47db601 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -149,9 +149,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { } @Override - public PageInfo> findByMerchantId(Long id, String tenantId, Integer pageIndex, Integer pageSize) { + public PageInfo> findByRentContractId(Long id, String tenantId, Integer pageIndex, Integer pageSize) { WxBillRent record = new WxBillRent(); - record.setMerchantId(id); + record.setRentContractId(id); record.setTenantId(tenantId); record.setSortColumns(WxBillRent.Field.Id_ASC); updateBillStatus(record); diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index ea7c10248..2c6e222f6 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -98,7 +98,7 @@ and br.`is_del` = #{isDel} and br.`receive_date` between #{starttime} and #{endtime} and br.`rent_shop_type` = #{rentShopType} - + and br.`property_contract_id` = #{propertyContractId} order by br.${sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index e7f242614..91cc63fc1 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -100,6 +100,7 @@ and br.`is_del` = #{isDel} and br.`receive_date` between #{starttime} and #{endtime} and br.`rent_shop_type` = #{rentShopType} + and br.`rent_contract_id` = #{rentContractId} order by br.${sortColumns}