From 91a46d8a0a1a89aa7a8f19d9a0df6d6d3906b181 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sun, 22 Dec 2024 18:09:47 +0800 Subject: [PATCH] fix --- .../WxPropertyContractController.java | 2 +- .../contract/WxRentContractController.java | 23 ++----------------- .../service/WxPropertyContractService.java | 2 +- .../impl/WxPropertyContractServiceImpl.java | 11 ++++++--- .../impl/WxRentContractServiceImpl.java | 3 ++- 5 files changed, 14 insertions(+), 27 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 90454e4e1..f6bdd3929 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -507,7 +507,7 @@ public class WxPropertyContractController extends WxContractBaseController { } try { - wxPropertyContractService.renewal(contract,user); + wxPropertyContractService.renewal(contract,user,false); }catch(Exception e) { logger.error("renewal error.",e); return new ResultData(Result.ERROR,e.getMessage()); 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 f70964424..78ca517a4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -599,35 +599,16 @@ public class WxRentContractController extends WxContractBaseController { //转签 @PostMapping("transfer") public ResultData transfer(@RequestBody WxRentContract wxRentContract) { - if (null == wxRentContract.getCustomerType() || StringUtils.isBlank(wxRentContract.getCustomerName()) || StringUtils.isBlank(wxRentContract.getCustomerPhone())){ + if (null == wxRentContract.getId() || null == wxRentContract.getCustomerType() || + StringUtils.isBlank(wxRentContract.getCustomerName()) || StringUtils.isBlank(wxRentContract.getCustomerPhone())){ return new ResultData(Result.ERROR, "缺少参数"); } - if (null == wxRentContract.getRentalStartDate() || null == wxRentContract.getRentalEndDate()){ - return new ResultData(Result.ERROR, "请选择租赁开始日期和截止日期"); - } - - if (null == wxRentContract.getStartDate()){ - return new ResultData(Result.ERROR, "请选择计租日期"); - } - - if (null == wxRentContract.getSignDate()){ - return new ResultData(Result.ERROR, "请选择签约日期"); - } - WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId()); if (null == rentContract) { return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同"); } - if (!(rentContract.getRentalEndDate().before(wxRentContract.getRentalStartDate()))) { - return new ResultData(Result.ERROR, "续租合同开始日期要大于原合同截止日期"); - } - - if (rentContract.getStatus().intValue() == EnumRentContractStatus.UNWRITE.getCode().intValue()) { - return new ResultData(Result.ERROR,"租金合同未完善,请先完善。"); - } - if (rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { if (null == wxRentContract.getPropertyId()) { return new ResultData(Result.ERROR,"未创建物业合同,请先完善。"); diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 05c95b094..4a5d9f10c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -72,7 +72,7 @@ public interface WxPropertyContractService { ResultData apply(WxPropertyContract wxPropertyContract,MallUserInfo user); - void renewal(WxPropertyContract wxPropertyContract,MallUserInfo user); + void renewal(WxPropertyContract wxPropertyContract,MallUserInfo user,boolean aliasRentContract); void outDateContract(WxMall wxMall); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 24b1f38dc..ff667612f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -1452,7 +1452,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override @Transactional(rollbackFor = {Exception.class}) - public void renewal(WxPropertyContract record, MallUserInfo user) { + public void renewal(WxPropertyContract record, MallUserInfo user,boolean aliasRentContract) { final IdWorker idWorker = IdWorker.get(); Long newContractId = idWorker.nextId(); //拷贝 @@ -1485,8 +1485,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService record.setFirstBillReceiveDate(null); int[] array = DateUtils.getDiff(record.getRentalStartDate(),record.getRentalEndDate()); record.setLease(array[0]); - record.setRentContractId(null); - record.setCreateType(EnumPropertyCreateType.BY_SHOP.getCode()); + if (aliasRentContract) { + //record.setRentContractId(null); + record.setCreateType(EnumPropertyCreateType.BY_RENT.getCode()); + }else { + record.setRentContractId(null); + record.setCreateType(EnumPropertyCreateType.BY_SHOP.getCode()); + } wxPropertyContractMapper.insert(record); } 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 3331f3c90..37d4d24b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2087,7 +2087,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { propertyContract.setSignDate(rentContract.getSignDate()); propertyContract.setStartDate(rentContract.getStartDate()); propertyContract.setEndDate(rentContract.getStartDate()); - wxPropertyContractService.renewal(propertyContract, user); + propertyContract.setRentContractId(newContractId); + wxPropertyContractService.renewal(propertyContract, user,true); } }