|
|
|
@@ -251,24 +251,6 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
MallUserInfo user = getUser(); |
|
|
|
wxPropertyContract.updateTenantInfo(user); |
|
|
|
wxPropertyContract.setAdjustPeriodHandle(); |
|
|
|
if (null == wxPropertyContract.getCreateType()) { |
|
|
|
wxPropertyContract.setCreateType(EnumPropertyCreateType.BY_RENT.getCode().intValue()); |
|
|
|
} |
|
|
|
if (wxPropertyContract.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { |
|
|
|
if (StringUtils.isBlank(wxPropertyContract.getRentArea()) || StringUtils.isBlank(wxPropertyContract.getShopIds())) { |
|
|
|
return new ResultData("rentArea,shopIds参数不能为空"); |
|
|
|
} |
|
|
|
wxPropertyContract.setShopIds(","+wxPropertyContract.getShopIds()+","); |
|
|
|
wxPropertyContract.calcutePrice(wxPropertyContract.getRentArea()); |
|
|
|
}else { |
|
|
|
WxRentContract rentContract = rentContractService.getSimpleDeatil(wxPropertyContract.getRentContractId()); |
|
|
|
wxPropertyContract.calcutePrice(rentContract.getRentArea()); |
|
|
|
} |
|
|
|
Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); |
|
|
|
wxPropertyContract.setContractType(contractType); |
|
|
|
if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ |
|
|
|
wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); |
|
|
|
} |
|
|
|
if (null != wxPropertyContract.getFeeStandards() && wxPropertyContract.getFeeStandards().size() > 0 ) { |
|
|
|
wxPropertyContract.setFeesStandardsInfo(JSON.toJSONString(wxPropertyContract.getFeeStandards())); |
|
|
|
} |
|
|
|
|