From fac06a7f307579c5bf9d383f1dcfe9d081544678 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 23 Oct 2018 14:36:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=90=88=E5=90=8C][=E5=B7=B2=E6=9C=89?= =?UTF-8?q?=E5=90=88=E5=90=8C=E7=9A=84=E5=BA=97=E9=93=BA=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E9=80=89=E6=8B=A9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/mapper/WxRentContractMapper.java | 2 ++ .../service/impl/WxRentContractServiceImpl.java | 12 ++++++------ .../main/resources/mapper/WxRentContractMapper.xml | 5 +++++ .../src/main/resources/mapper/WxShopMapper.xml | 6 ++++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 8d864d48e..06cd5fbfc 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -29,4 +29,6 @@ public interface WxRentContractMapper extends CommonMapper shopLeftInfo=wxShopMapper.queryShopLeftInfo(shopparams); resultData.put("shopLeftInfo",shopLeftInfo); - //待签约 - WxRentContract wxRentContract = new WxRentContract(); - wxRentContract.setTenantId(tenantId); - wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); - int waitSignCount=wxRentContractMapper.queryRentContractWaitSignStatus(wxRentContract); - resultData.put("waitSignCount",waitSignCount); //需要更新的状态 resultData.putAll(updateStatus(tenantId)); return resultData; @@ -305,6 +299,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxRentContract wxRentContract = new WxRentContract(); wxRentContract.setTenantId(tenantId); + //待签约 + wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); + wxRentContractMapper.updateRentWaitSignStatus(wxRentContract); + int waitSignCount=wxRentContractMapper.queryRentContractWaitSignStatus(wxRentContract); + resultData.put("waitSignCount",waitSignCount); + //计租中 wxRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); int rendPaidCount =wxRentContractMapper.queryRentContractPaidStatus(wxRentContract); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 42f0d4ef3..9487d7d8f 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -125,5 +125,10 @@ update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and rental_end_date <now() + + + update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and merchant_id is null + + diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 946a7e158..04949d680 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -170,12 +170,14 @@ - + and s.`status` = #{status} - and s.id not in(select shop_id from wx_rent_contract where status!=1 and status!=6 and merchant_id is not null) + and s.id not in( + SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status!=1 and status!=6 and merchant_id is not null + )