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