Просмотр исходного кода

Merge branch 'release_toaliyun_real' into release_toaliyun_real_202208

release_toaliyun_real
zhengfangyuan 3 лет назад
Родитель
Сommit
33bef0bcba
2 измененных файлов: 7 добавлений и 3 удалений
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java
  2. +5
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java Просмотреть файл

@@ -75,7 +75,8 @@ public class WxContractBaseController extends BaseController{
protected boolean rentContractHasWorkFlow(WxRentContract wxRentContract) {
WxFlowModel wxFlowModel = new WxFlowModel();
if(wxRentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) {
if(wxRentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue() ||
wxRentContract.getOperationType().intValue() == EnumContractOperationType.JINMAO.getCode().intValue()) {
if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) {
wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_CONTRACT.getCode());
}else if (wxRentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) {


+ 5
- 2
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Просмотреть файл

@@ -653,18 +653,21 @@ public class WxRentContractController extends WxContractBaseController {
}
}
if(rentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) {
if(rentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue() ||
rentContract.getOperationType().intValue() == EnumContractOperationType.JINMAO.getCode().intValue()) {
if (rentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) {
rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_RENT_CONTRACT, EnumFlowContractType.RENT, wxRentContract.getRemark(), wxRentContract.getId(),null));
}else if (rentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) {
rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_SHOP_CONTRACT, EnumFlowContractType.RENT_POINT, wxRentContract.getRemark(), wxRentContract.getId(),null));
}
}else {
}else if(rentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()){
if (rentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) {
rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NNEW_RENT_CONTRACT, EnumFlowContractType.WHOLE_SHOP, wxRentContract.getRemark(), wxRentContract.getId(),wxRentContract.getPropertyId()));
}else if (rentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) {
rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_RENT_POINT_CONTRACT, EnumFlowContractType.WHOLE_POINT, wxRentContract.getRemark(), wxRentContract.getId(),wxRentContract.getPropertyId()));
}
}else {
return new ResultData(Result.ERROR,"合同操作类型非法。");
}
return wxRentContractService.apply(rentContract,user);
}


Загрузка…
Отмена
Сохранить