diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index f94b24ece..ff15d0d45 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -196,7 +196,8 @@ public class WxRentContractController extends WxContractBaseController { if (cure.getStatus().intValue() == EnumRentContractStatus.DRAFT.getCode().intValue() || (cure.getStatus().intValue() == EnumRentContractStatus.PERFORMANCE.getCode().intValue() - && cure.getApplyStatus().intValue()== EnumRentContractAppStatus.REJECT.getCode().intValue())) { + && (cure.getApplyStatus().intValue()== EnumRentContractAppStatus.REJECT.getCode().intValue() || + cure.getApplyStatus().intValue()== EnumRentContractAppStatus.SETBACK.getCode().intValue()))) { if(StringUtils.isBlank(rentContract.getBusDiscountRatio())){ rentContract.setBusDiscountTime(new Integer(0)); } @@ -336,7 +337,8 @@ public class WxRentContractController extends WxContractBaseController { } if (contract.getStatus().intValue() == EnumRentContractStatus.DRAFT.getCode().intValue() || (contract.getStatus().intValue() == EnumRentContractStatus.PERFORMANCE.getCode().intValue() - && contract.getApplyStatus().intValue() == EnumRentContractAppStatus.REJECT.getCode().intValue())) { + && (contract.getApplyStatus().intValue() == EnumRentContractAppStatus.REJECT.getCode().intValue() || + contract.getApplyStatus().intValue() == EnumRentContractAppStatus.SETBACK.getCode().intValue()))) { contract.setStatus(EnumRentContractStatus.INVALID.getCode()); contract.setUpdatetime(new Date()); return wxRentContractService.updateRentContract(contract); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index f5c4a494b..bebdf2e1c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2470,7 +2470,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { if ((EnumRentContractStatus.DRAFT.getCode().intValue() == rentContract.getStatus().intValue() && EnumRentContractAppStatus.DEFAULT.getCode().intValue() == rentContract.getApplyStatus().intValue()) || (EnumRentContractStatus.PERFORMANCE.getCode().intValue() == rentContract.getStatus().intValue() - && EnumRentContractAppStatus.REJECT.getCode().intValue() == rentContract.getApplyStatus().intValue()) + && (EnumRentContractAppStatus.REJECT.getCode().intValue() == rentContract.getApplyStatus().intValue() || + EnumRentContractAppStatus.SETBACK.getCode().intValue() == rentContract.getApplyStatus().intValue())) ) { Integer bussinessType = (Integer) rentContract.getFlowParams().get("businessType"); if (null == bussinessType) {