|
|
|
@@ -55,6 +55,8 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
WxMallFloorService floorService; |
|
|
|
@Autowired |
|
|
|
private WxShopService wxShopService; |
|
|
|
@Autowired |
|
|
|
private WxRentContractService rentContractService; |
|
|
|
|
|
|
|
@GetMapping("/list") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@@ -165,7 +167,8 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
MallUserInfo user = getUser(); |
|
|
|
wxPropertyContract.updateTenantInfo(user); |
|
|
|
wxPropertyContract.setAdjustPeriodHandle(); |
|
|
|
wxPropertyContract.calcutePrice(); |
|
|
|
WxRentContract rentContract = rentContractService.getSimpleDeatil(wxPropertyContract.getRentContractId()); |
|
|
|
wxPropertyContract.calcutePrice(rentContract); |
|
|
|
Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); |
|
|
|
wxPropertyContract.setContractType(contractType); |
|
|
|
if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ |
|
|
|
@@ -182,7 +185,8 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
MallUserInfo user = getUser(); |
|
|
|
propertyContract.updateTenantInfo(user); |
|
|
|
propertyContract.setAdjustPeriodHandle(); |
|
|
|
wxPropertyContract.calcutePrice(); |
|
|
|
WxRentContract rentContract = rentContractService.getSimpleDeatil(propertyContract.getRentContractId()); |
|
|
|
wxPropertyContract.calcutePrice(rentContract); |
|
|
|
propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); |
|
|
|
return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(),false); |
|
|
|
} |
|
|
|
@@ -204,7 +208,8 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
*/ |
|
|
|
@PostMapping("calcutePrice") |
|
|
|
public ResultData calcutePrice(@RequestBody WxPropertyContract wxPropertyContract) { |
|
|
|
wxPropertyContract.calcutePrice(); |
|
|
|
WxRentContract rentContract = rentContractService.getSimpleDeatil(wxPropertyContract.getRentContractId()); |
|
|
|
wxPropertyContract.calcutePrice(rentContract); |
|
|
|
return new ResultData(wxPropertyContract.getPrice()); |
|
|
|
} |
|
|
|
|
|
|
|
|