| @@ -71,12 +71,6 @@ public class WxPropertyContractController extends BaseController { | |||||
| public ResultData updateRentStartTime(@RequestBody WxPropertyContract wxPropertyContract) { | public ResultData updateRentStartTime(@RequestBody WxPropertyContract wxPropertyContract) { | ||||
| logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); | logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); | ||||
| WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); | WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); | ||||
| propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate()); | |||||
| if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ | |||||
| propertyContract.setRentalStartDate(propertyContract.getStartDate()); | |||||
| } | |||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| propertyContract.setTenantId(user.getTenantId()); | propertyContract.setTenantId(user.getTenantId()); | ||||
| propertyContract.setAdjustPeriodHandle(); | propertyContract.setAdjustPeriodHandle(); | ||||
| @@ -707,9 +707,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| if (wxPropertyContract != null) { | if (wxPropertyContract != null) { | ||||
| int receivePeriod = wxPropertyContract.getReceivePeriod().intValue(); | int receivePeriod = wxPropertyContract.getReceivePeriod().intValue(); | ||||
| Integer lease = wxPropertyContract.getLease(); | Integer lease = wxPropertyContract.getLease(); | ||||
| Date rentalStartDate = propertyContract.getRentalStartDate(); | |||||
| if (propertyContract.getRentShopType().equals(EnumRentStartType.STARTTIME.getCode())) { | |||||
| rentalStartDate = propertyContract.getStartDate(); | |||||
| Date rentalStartDate = wxPropertyContract.getRentalStartDate(); | |||||
| System.out.println(wxPropertyContract.getRentStartType().intValue() + "------------------"); | |||||
| if (wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { | |||||
| rentalStartDate = wxPropertyContract.getStartDate(); | |||||
| } | } | ||||
| propertyContract.setRentalStartDate(rentalStartDate); | propertyContract.setRentalStartDate(rentalStartDate); | ||||
| Long price = propertyContract.getPrice(); | Long price = propertyContract.getPrice(); | ||||