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 e9897ff69..6f51ea0b4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -152,7 +152,7 @@ public class WxPropertyContractController extends WxContractBaseController { * @param wxRentContract * @return */ - @GetMapping("/unvalid") + @PostMapping("/unvalid") @SystemControllerLog(description = "物业合同-作废合同") public ResultData unvalid(@RequestBody WxPropertyContract proertyContract) { WxPropertyContract contract = wxPropertyContractService.getSimpleDetail(proertyContract.getId()); @@ -192,7 +192,7 @@ public class WxPropertyContractController extends WxContractBaseController { return new ResultData(proertyContract); } - @GetMapping("effective") + @PostMapping("effective") @ApiImplicitParams({}) @SystemControllerLog(description = "物业合同-合同生效") public ResultData effective(@RequestBody WxPropertyContract proertyContract) { 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 5b546ac6f..6d1267ec7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2502,6 +2502,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { wr.setStatuss(EnumRentContractStatus.getValidStatus()); List merchantIds = wxRentContractMapper.getMerchantIdsByStatuss(wr); for (Long mid: merchantIds) { + if (null == mid) { + continue; + } try { //查询商户下计租到期的合同,更新合同状态 WxRentContract wrc = new WxRentContract(); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 055ffb6f4..7bfe03290 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -686,7 +686,10 @@