| @@ -174,7 +174,6 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| if (null == wxPropertyContract.getCreateType()) { | if (null == wxPropertyContract.getCreateType()) { | ||||
| return new ResultData("createType参数不能为空"); | return new ResultData("createType参数不能为空"); | ||||
| } | } | ||||
| wxPropertyContract.setContractNumber(null); | |||||
| if (wxPropertyContract.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { | if (wxPropertyContract.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { | ||||
| if (StringUtils.isBlank(wxPropertyContract.getRentArea()) || StringUtils.isBlank(wxPropertyContract.getShopIds())) { | if (StringUtils.isBlank(wxPropertyContract.getRentArea()) || StringUtils.isBlank(wxPropertyContract.getShopIds())) { | ||||
| return new ResultData(Result.ERROR,"请选择店铺"); | return new ResultData(Result.ERROR,"请选择店铺"); | ||||
| @@ -251,6 +250,8 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| wxPropertyContract.updateTenantInfo(user); | wxPropertyContract.updateTenantInfo(user); | ||||
| wxPropertyContract.setAdjustPeriodHandle(); | wxPropertyContract.setAdjustPeriodHandle(); | ||||
| wxPropertyContract.setContractNumber(null); | |||||
| wxPropertyContract.setMerchantName(null); | |||||
| if (null != wxPropertyContract.getFeeStandards() && wxPropertyContract.getFeeStandards().size() > 0 ) { | if (null != wxPropertyContract.getFeeStandards() && wxPropertyContract.getFeeStandards().size() > 0 ) { | ||||
| wxPropertyContract.setFeesStandardsInfo(JSON.toJSONString(wxPropertyContract.getFeeStandards())); | wxPropertyContract.setFeesStandardsInfo(JSON.toJSONString(wxPropertyContract.getFeeStandards())); | ||||
| } | } | ||||