| @@ -152,7 +152,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| * @param wxRentContract | * @param wxRentContract | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| @GetMapping("/unvalid") | |||||
| @PostMapping("/unvalid") | |||||
| @SystemControllerLog(description = "物业合同-作废合同") | @SystemControllerLog(description = "物业合同-作废合同") | ||||
| public ResultData unvalid(@RequestBody WxPropertyContract proertyContract) { | public ResultData unvalid(@RequestBody WxPropertyContract proertyContract) { | ||||
| WxPropertyContract contract = wxPropertyContractService.getSimpleDetail(proertyContract.getId()); | WxPropertyContract contract = wxPropertyContractService.getSimpleDetail(proertyContract.getId()); | ||||
| @@ -192,7 +192,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| return new ResultData(proertyContract); | return new ResultData(proertyContract); | ||||
| } | } | ||||
| @GetMapping("effective") | |||||
| @PostMapping("effective") | |||||
| @ApiImplicitParams({}) | @ApiImplicitParams({}) | ||||
| @SystemControllerLog(description = "物业合同-合同生效") | @SystemControllerLog(description = "物业合同-合同生效") | ||||
| public ResultData effective(@RequestBody WxPropertyContract proertyContract) { | public ResultData effective(@RequestBody WxPropertyContract proertyContract) { | ||||
| @@ -2502,6 +2502,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| wr.setStatuss(EnumRentContractStatus.getValidStatus()); | wr.setStatuss(EnumRentContractStatus.getValidStatus()); | ||||
| List<Long> merchantIds = wxRentContractMapper.getMerchantIdsByStatuss(wr); | List<Long> merchantIds = wxRentContractMapper.getMerchantIdsByStatuss(wr); | ||||
| for (Long mid: merchantIds) { | for (Long mid: merchantIds) { | ||||
| if (null == mid) { | |||||
| continue; | |||||
| } | |||||
| try { | try { | ||||
| //查询商户下计租到期的合同,更新合同状态 | //查询商户下计租到期的合同,更新合同状态 | ||||
| WxRentContract wrc = new WxRentContract(); | WxRentContract wrc = new WxRentContract(); | ||||
| @@ -686,7 +686,10 @@ | |||||
| </select> | </select> | ||||
| <select id="getMerchantIdsByStatuss" resultType="Long" parameterType="com.iformall.domain.po.WxRentContract"> | <select id="getMerchantIdsByStatuss" resultType="Long" parameterType="com.iformall.domain.po.WxRentContract"> | ||||
| select distinct merchant_id from wx_rent_contract where and `tenant_id` = #{tenantId} | |||||
| select distinct merchant_id from wx_rent_contract where 1=1 | |||||
| <if test=" null != tenantId and '' != tenantId"> | |||||
| and `tenant_id` = #{tenantId} | |||||
| </if> | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and `parent_tenant_id` = #{parentTenantId} | and `parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||