|
|
|
@@ -31,6 +31,7 @@ import java.io.*; |
|
|
|
import java.net.HttpURLConnection; |
|
|
|
import java.net.URL; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
/** |
|
|
|
* @author gongbiao |
|
|
|
@@ -113,6 +114,16 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
record.setCreatetime(date); |
|
|
|
record.setUpdatetime(date); |
|
|
|
try { |
|
|
|
WxRentContract wxRentContract = new WxRentContract(); |
|
|
|
wxRentContract.setTenantId(record.getTenantId()); |
|
|
|
wxRentContract.setShopId(record.getShopId()); |
|
|
|
long count = wxRentContractMapper.queryRentContractData(wxRentContract).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())).count(); |
|
|
|
if(count>0){ |
|
|
|
return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND); |
|
|
|
} |
|
|
|
wxRentContractMapper.insertSelective(record); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("保存租赁合同信息失败,e:" + e.getMessage()); |
|
|
|
@@ -136,6 +147,17 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
record.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); |
|
|
|
} |
|
|
|
try { |
|
|
|
WxRentContract wxRentContractParams = new WxRentContract(); |
|
|
|
wxRentContractParams.setTenantId(record.getTenantId()); |
|
|
|
wxRentContractParams.setShopId(record.getShopId()); |
|
|
|
long count = wxRentContractMapper.queryRentContractData(wxRentContractParams).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("id").equals(wxRentContract.getId())).count(); |
|
|
|
if(count>0){ |
|
|
|
return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND); |
|
|
|
} |
|
|
|
wxRentContractMapper.updateByPrimaryKeySelective(record); |
|
|
|
//建立账单 |
|
|
|
if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) |
|
|
|
|