winter 2 лет назад
Родитель
Сommit
15e7208f13
3 измененных файлов: 24 добавлений и 9 удалений
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  3. +20
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

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

@@ -255,14 +255,14 @@ public class WxRentContractController extends WxContractBaseController {
}
MallUserInfo user = getUser();
wxRentContract.updateTenantInfo(user);
wxRentContract.setAdjustPeriodHandle();
//wxRentContract.setAdjustPeriodHandle();
//wxRentContract.setRentPriceHandle();
Date oldDate = wxRentContract.getRentalStartDate();
if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
wxRentContract.setRentalStartDate(wxRentContract.getStartDate());
}
wxRentContract.setRentShopType(null);
wxRentContract.setOperationType(null);
//wxRentContract.setRentShopType(null);
//wxRentContract.setOperationType(null);
return wxRentContractService.updateFile(wxRentContract, user.getId(),user.getName(),oldDate,true);
}


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

@@ -460,7 +460,7 @@ public class WxRentContract extends TenantEntity {
public void calcutePrice() {
//如果是按铺位数算,price不用计算,是填写的值
if (!this.type.equals(EnumRentContractType.RENT_BY_COUNT.getCode())) {
if (StringUtils.isNoneBlank(this.rentArea) && StringUtils.isNotBlank(this.rentPrice)) {
if (StringUtils.isNotBlank(this.rentArea) && StringUtils.isNotBlank(this.rentPrice)) {
this.price = new BigDecimal(this.rentArea).multiply(new BigDecimal(this.rentPrice)).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
}
}


+ 20
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -1930,19 +1930,34 @@ public class WxRentContractServiceImpl implements WxRentContractService {
@Override
@Transactional(rollbackFor = {Exception.class})
public ResultData updateFile(WxRentContract record, Long userId,String userName,Date oldRentStartDate,boolean writeComplate) {
WxRentContract wxRentContract = wxRentContractMapper.selectById(record.getId());
if (null == wxRentContract) {
return new ResultData(Result.ERROR,"id查询不到合同");
}
// 保存调整金额(预账单调整)
if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){
savePreviewBill(record);
wxRentContract.setPreviewBillRentList(record.getPreviewBillRentList());
savePreviewBill(wxRentContract);
//保存商业管理费账单
savePreviewManageFeeBill(record,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE);
savePreviewManageFeeBill(wxRentContract,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE);
//保存营业管理费账单
savePreviewManageFeeBill(record,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE);
savePreviewManageFeeBill(wxRentContract,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE);
}
ResultData resultData = getResultDataForUpdate(record, userId,0,oldRentStartDate,writeComplate);
// ResultData resultData = getResultDataForUpdate(record, userId,0,oldRentStartDate,writeComplate);
// if (resultData.code != Result.SUCCESS) {
// return resultData;
// }
return resultData;
WxRentContract rc = new WxRentContract();
rc.setId(record.getId());
rc.setRentalStartDate(oldRentStartDate);
if (writeComplate) {
rc.setStatus(EnumRentContractStatus.DRAFT.getCode());
}else {
rc.setStatus(wxRentContract.getStatus());
}
wxRentContractMapper.updateById(rc);
return new ResultData(wxRentContract);
}

@Override


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