|
|
|
@@ -11,6 +11,7 @@ import com.iformall.domain.po.WxBillProperty; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxPropertyContract; |
|
|
|
import com.iformall.domain.po.WxRentContract; |
|
|
|
import com.iformall.enums.EnumContractOperationType; |
|
|
|
import com.iformall.enums.EnumContractType; |
|
|
|
import com.iformall.enums.EnumFlowContractType; |
|
|
|
import com.iformall.enums.EnumFlowKey; |
|
|
|
@@ -209,11 +210,18 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
if(propertyContractHasWorkFlow(contract)) { |
|
|
|
return new ResultData(ErrorCode.FLOW_FAIL.getCode(),"租赁合同存在工作流,不允许直接生效。"); |
|
|
|
} |
|
|
|
|
|
|
|
if (contract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.PROPERTY, contract.getRemark(), contract.getId())); |
|
|
|
}else if (contract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_POINT_CONTRACT, EnumFlowContractType.PROPERTY_POINT, contract.getRemark(), contract.getId())); |
|
|
|
if(contract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { |
|
|
|
if (contract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.PROPERTY, contract.getRemark(), contract.getId())); |
|
|
|
}else if (contract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_POINT_CONTRACT, EnumFlowContractType.PROPERTY_POINT, contract.getRemark(), contract.getId())); |
|
|
|
} |
|
|
|
}else { |
|
|
|
if (contract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.WHOLE_SHOP, contract.getRemark(), contract.getId())); |
|
|
|
}else if (contract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_POINT_CONTRACT, EnumFlowContractType.WHOLE_POINT, contract.getRemark(), contract.getId())); |
|
|
|
} |
|
|
|
} |
|
|
|
return wxPropertyContractService.apply(contract,user); |
|
|
|
} |
|
|
|
|