From 28d9c4d2383c31c95bcc8ca4a82cf5a09f845d54 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 1 Apr 2019 15:27:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E7=AD=BE=E7=BA=A6?= =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxRentContractController.java | 8 ++++++++ .../java/com/iformall/mapper/WxRentContractMapper.java | 3 +++ .../java/com/iformall/service/WxRentContractService.java | 1 + .../iformall/service/impl/WxRentContractServiceImpl.java | 6 ++++++ .../src/main/resources/mapper/WxRentContractMapper.xml | 7 +++++++ 5 files changed, 25 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index 5f15cabc5..2dd776761 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -196,4 +196,12 @@ public class WxRentContractController extends BaseController { return new ResultData(); } + @GetMapping("/getMerchants") + @SystemControllerLog(description = "租赁合同-获取已签约租赁合同且未有物业的商户") + public ResultData getMerchants(@ModelAttribute WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::getMerchants"); + wxRentContract.setTenantId(getTenantId()); + return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getMerchants(wxRentContract)); + } + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 1d452a296..ed8154972 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -44,4 +44,7 @@ public interface WxRentContractMapper extends CommonMapper getMerchants(WxRentContract wxRentContract); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 88a15e878..1dcf07be7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -75,4 +75,5 @@ public interface WxRentContractService { void buildDeposit(WxMerchant wxMerchant, Long userId,Long rentContractId); + Object getMerchants(WxRentContract wxRentContract); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index ecdeee104..3a4c3587a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -451,6 +451,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { } } + @Override + public Object getMerchants(WxRentContract wxRentContract) { + List rentContractList = wxRentContractMapper.getMerchants(wxRentContract); + return rentContractList; + } + @Override @Transactional(rollbackFor = {Exception.class}) public List buildRent(WxMerchant wxMerchant, Long userId,WxRentContract rentContract,Integer isPreview) { diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index cc1a59017..c96f793cc 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -212,5 +212,12 @@ select count(*) from wx_rent_contract r,wx_bill_rent b where b.rent_contract_id = r.id and b.status = 1 and r.id = #{id} + +