Преглед изворни кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xhxu пре 5 година
родитељ
комит
961e6eb717
2 измењених фајлова са 6 додато и 4 уклоњено
  1. +5
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 5
- 3
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Прегледај датотеку

@@ -295,7 +295,7 @@ public class WxPropertyContractController extends WxContractBaseController {
}
if (rentHasValidProperty(contract)) {
return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效的物业合同。");
return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效或者审批中的物业合同。");
}
wxPropertyContractService.updatePropertyContractStatus(proertyContract.getId());
return new ResultData(Result.SUCCESS,"合同生效成功!");
@@ -304,7 +304,9 @@ public class WxPropertyContractController extends WxContractBaseController {
private boolean rentHasValidProperty(WxPropertyContract contract) {
WxPropertyContract wpc = new WxPropertyContract();
wpc.setRentContractId(contract.getRentContractId());
wpc.setStatuss(EnumRentContractStatus.getValidStatus());
List<Integer> statuss = EnumRentContractStatus.getValidStatus();
statuss.add(EnumRentContractStatus.PERFORMANCE.getCode());
wpc.setStatuss(statuss);
List<WxPropertyContract> list = wxPropertyContractService.findList(wpc);
if (null != list && list.size() > 0 ) {
return true;
@@ -327,7 +329,7 @@ public class WxPropertyContractController extends WxContractBaseController {
}
if (rentHasValidProperty(contract)) {
return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效的物业合同。");
return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效或者审批中的物业合同。");
}
if(contract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Прегледај датотеку

@@ -411,7 +411,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
record.setEndDate(record.getStartDate());
}

if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {
if (null != record.getType() && record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {
if(record.getRevenue() == null || record.getRevenue().longValue() <= 0){
record.setPrice(0l);
}else{


Loading…
Откажи
Сачувај