Browse Source

[租金物业合同][修改][驳回后店铺提示存在问题]

release_toaliyun_real
gongbiao 6 years ago
parent
commit
9d3b9a88a3
2 changed files with 17 additions and 1 deletions
  1. +11
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  2. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 11
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java View File

@@ -45,6 +45,7 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -151,11 +152,20 @@ public class WxFlowServiceImpl implements WxFlowService {
rent.setBusinessType(flowType);
wxRentContractService.updateApplyStatus(rent);

//如果审批完成,而且是补录直接改为已签约状态(普通需要绑定商户才是已签约)
WxRentContract record = wxRentContractMapper.selectById(businessId);
//合并的合同-审批时 物业合同的状态肯定不在 签约中 避免更新物业合同时提示店铺存在
if(record.getOperationType().equals(EnumContractOperationType.WHOLE.getCode())){
WxPropertyContract wxPropertyContract = new WxPropertyContract();
wxPropertyContract.setRentContractId(record.getId());
wxPropertyContract.setStatus(EnumRentContractStatus.INTENTION.getCode());
wxPropertyContractMapper.updateStatusByRentContractId(wxPropertyContract);
}

//如果审批完成,而且是补录直接改为已签约状态(普通需要绑定商户才是已签约)
if(record != null && record.getMerchantId()!=null && EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) {
wxRentContractService.updateRentContractStatus(businessId);
}

}else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType) || EnumFlowContractType.PROPERTY_POINT.getCode().equals(contractType)){
WxPropertyContract wxPropertyContract = new WxPropertyContract();
wxPropertyContract.setId(businessId);


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java View File

@@ -387,6 +387,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
record.setPrice(record.getPrice() != null ? record.getPrice() : 0);
record.setDeposit(record.getDeposit() != null ? record.getDeposit() : 0);
record.setUpdatetime(new Date());

//如果是合并合同 物业合同的状态为 意向
if (record.getOperationType().equals(EnumContractOperationType.WHOLE.getCode())) {
record.setStatus(EnumRentContractStatus.INTENTION.getCode());
}

if (CollectionUtils.isEmpty(record.getFlowParams())) {
hasFlow = false;
record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode());


Loading…
Cancel
Save