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

[租赁合同][修改][查询时不再更新待签约]

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

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

@@ -92,7 +92,8 @@ public class WxMerchantServiceImpl implements WxMerchantService {
for (WxMerchant merchant : merchants) {
List<WxRentContract> 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());


+ 8
- 5
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<String, Object> wxPropertyContract = null;
if (first.isPresent()) {
wxPropertyContract = first.get();


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

@@ -149,19 +149,19 @@
</select>
<update id="updateRentContractEndSoonStatus" parameterType="com.iformall.domain.po.WxRentContract">
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()) &lt;= 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()) &lt;= 30 and rental_end_date > now()
</update>
<update id="updateRentContractPaidStatus" parameterType="com.iformall.domain.po.WxRentContract">
update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and rental_start_date &lt;= 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 &lt;= now() and rental_end_date >= now()
</update>
<update id="updateRentContractEndStatus" parameterType="com.iformall.domain.po.WxRentContract">
update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and rental_end_date &lt;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 &lt;now()
</update>
<update id="updateRentWaitSignStatus" parameterType="com.iformall.domain.po.WxRentContract">
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
</update>

<update id="updateApplyStatus" parameterType="com.iformall.domain.po.WxRentContract">


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