Просмотр исходного кода

fix contract bill

release_toaliyun_real
winter 2 лет назад
Родитель
Сommit
a91c1a27a2
2 измененных файлов: 11 добавлений и 6 удалений
  1. +8
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java

+ 8
- 3
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Просмотреть файл

@@ -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());
}


+ 3
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java Просмотреть файл

@@ -229,11 +229,11 @@ public class WxPropertyContract extends TenantEntity {
}
}
public void calcutePrice() {
public void calcutePrice(WxRentContract rentContract) {
//如果是固定的,则不计算
if (!fixedPrice.equals(EnumYesOrNo.YES.getCode())) {
if (StringUtils.isNoneBlank(this.rentArea) && StringUtils.isNotBlank(this.rentPrice)) {
this.price = new BigDecimal(this.rentArea).multiply(new BigDecimal(this.rentPrice)).setScale(this.decimalSize, RoundingMode.HALF_UP).toPlainString();
if (StringUtils.isNoneBlank(rentContract.getRentArea()) && StringUtils.isNotBlank(this.rentPrice)) {
this.price = new BigDecimal(rentContract.getRentArea()).multiply(new BigDecimal(this.rentPrice)).setScale(this.decimalSize, RoundingMode.HALF_UP).toPlainString();
}
}
}


Загрузка…
Отмена
Сохранить