Просмотр исходного кода

[租赁合同][修改][添加新合同时判断店铺是否已关联]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
4b33bd645f
4 измененных файлов: 27 добавлений и 1 удалений
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  3. +22
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  4. +2
    -0
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 2
- 1
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Просмотреть файл

@@ -238,7 +238,8 @@ public enum ErrorCode{
* 租赁合同
* */
RENT_CONTRACT_IS_NOT_FOUND(15000,"租赁合同不存在"),
RENT_CONTRACT_IS_TERMINATED(15001,"租凭合同已终止"),
RENT_CONTRACT_IS_TERMINATED(15001,"租赁合同已终止"),
RENT_CONTRACT_WITH_SHOP_IS_FOUND(15002,"店铺存在已关联的合同"),
/**
* 物业合同
* */


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -216,6 +216,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
return new ResultData(ErrorCode.SHOP_IS_RENT);
}
wxMerchantShopMapper.insertSelective(wxMerchantShop);
wxShop.setStatus(EnumShopStatus.RENT.getCode());
wxShopMapper.updateByPrimaryKeySelective(wxShop);

}


+ 22
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -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())


+ 2
- 0
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -94,6 +94,8 @@
<if test=" null != merchantName and merchantName!=''">and rc.`merchant_name` like concat('%',#{merchantName},'%')</if>
<if test=" null != shopNumber and shopNumber!=''">and s.`shop_number` like concat('%',#{shopNumber},'%')</if>
<if test=" null != status ">and rc.`status` = #{status}</if>
<if test=" null != shopId ">and rc.`shop_id` = #{shopId}</if>
</where>
order by rc.id desc
</select>


Загрузка…
Отмена
Сохранить