diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 501dcb128..7924f708b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -92,7 +92,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { for (WxMerchant merchant : merchants) { List collect = list.stream().filter(ms -> ms.getMerchantId() != null && ms.getMerchantId().equals(merchant.getId()) && !ms.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) - && !ms.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode())).collect(Collectors.toList()); + && !ms.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) + && !ms.getStatus().equals(EnumRentContractStatus.INTENTION.getCode())).collect(Collectors.toList()); if (collect != null && collect.size() > 0) { merchant.setRentalStartDate(collect.get(0).getRentalStartDate()); merchant.setRentalEndDate(collect.get(0).getRentalEndDate()); 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 fa9b6c24e..469ee9348 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -180,7 +180,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { filter(rc -> !rc.get("status").equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) && !rc.get("status").equals(EnumRentContractStatus.WAIT_SIGN.getCode()) && !rc.get("status").equals(EnumRentContractStatus.INVALID.getCode()) - && !rc.get("status").equals(EnumRentContractStatus.CONTRACT_END.getCode())).count(); + && !rc.get("status").equals(EnumRentContractStatus.CONTRACT_END.getCode()) + && !rc.get("status").equals(EnumRentContractStatus.INTENTION.getCode())).count(); if (count > 0) { return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND); } @@ -260,6 +261,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { && !rc.get("status").equals(EnumRentContractStatus.WAIT_SIGN.getCode()) && !rc.get("status").equals(EnumRentContractStatus.INVALID.getCode()) && !rc.get("status").equals(EnumRentContractStatus.CONTRACT_END.getCode()) + && !rc.get("status").equals(EnumRentContractStatus.INTENTION.getCode()) && !rc.get("id").equals(wxRentContract.getId())).count(); if (count > 0) { return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND); @@ -649,8 +651,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { } - //把状态为签约而商户未关联的数据改为待签约状态 - wxRentContractMapper.updateStatusForUnsign(wxRentContract); + //把状态为意见而商户未关联的数据改为待签约状态 + //wxRentContractMapper.updateStatusForUnsign(wxRentContract); //作废合同 wxRentContract.setStatus(EnumRentContractStatus.INVALID.getCode()); @@ -658,7 +660,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //待签约 wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); - wxRentContractMapper.updateRentWaitSignStatus(wxRentContract); + //wxRentContractMapper.updateRentWaitSignStatus(wxRentContract); int waitSignCount = wxRentContractMapper.queryRentContractWaitSignStatus(wxRentContract); resultData.put("waitSignCount", waitSignCount); @@ -963,7 +965,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { .stream().filter(rc -> !rc.get("status").equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) && !rc.get("status").equals(EnumRentContractStatus.WAIT_SIGN.getCode()) && !rc.get("status").equals(EnumRentContractStatus.INVALID.getCode()) - && !rc.get("status").equals(EnumRentContractStatus.CONTRACT_END.getCode())).findFirst(); + && !rc.get("status").equals(EnumRentContractStatus.CONTRACT_END.getCode()) + && !rc.get("status").equals(EnumRentContractStatus.INTENTION.getCode())).findFirst(); Map wxPropertyContract = null; if (first.isPresent()) { wxPropertyContract = first.get(); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 7825d71c3..9c1a7dbe7 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -149,19 +149,19 @@ - update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 and rental_end_date > now() + update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=0 and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 and rental_end_date > now() - update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and rental_start_date <= now() and rental_end_date >= now() + update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=0 and status!=1 and status!=6 and status!=7 and rental_start_date <= now() and rental_end_date >= now() - update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and rental_end_date <now() + update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=0 and status!=1 and status!=6 and status!=7 and rental_end_date <now() - update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=7 and merchant_id is null + update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=0 and status!=7 and merchant_id is null