@@ -115,48 +115,48 @@ public class WxRentContractServiceImpl implements WxRentContractService {
@Override
public ResultData save(WxRentContract record) {
//保存租赁合同信息
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
if(record.getStartDate().after(record.getRentalStartDate())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"起租开始时间不能大于计租开始时间");
}
//计租开始时间
Calendar instance = Calendar.getInstance();
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
if (record.getStartDate().after(record.getRentalStartDate())) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR, "起租开始时间不能大于计租开始时间");
}
//计租开始时间
Calendar instance = Calendar.getInstance();
instance.setTime(record.getRentalStartDate());
instance.add(Calendar.MONTH, record.getLease());
instance.add(Calendar.DAY_OF_MONTH, -1);
record.setRentalEndDate(instance.getTime());
//起租结束时间
if (!record.getStartDate().equals(record.getRentalStartDate())) {
instance.clear();
instance.setTime(record.getRentalStartDate());
instance.add(Calendar.MONTH, record.getLease());
instance.add(Calendar.DAY_OF_MONTH, -1);
record.setRentalEndDate(instance.getTime());
//起租结束时间
if(!record.getStartDate().equals(record.getRentalStartDate())){
instance.clear();
instance.setTime(record.getRentalStartDate());
instance.add(Calendar.DAY_OF_MONTH, -1);
record.setEndDate(instance.getTime());
}else{
record.setEndDate(record.getStartDate());
}
record.setEndDate(instance.getTime());
} else {
record.setEndDate(record.getStartDate());
}
Date date = new Date();
record.setCreatetime(date);
record.setUpdatetime(date);
try {
WxRentContract wxRentContract = new WxRentContract();
wxRentContract.setTenantId(record.getTenantId());
wxRentContract.setShopId(record.getShopId());
long count = wxRentContractMapper.queryRentContractData(wxRentContract).stream().
filter(rc -> !rc.get("status").equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode())
&& !rc.get("status").equals(EnumRentContractStatus.WAIT_SIGN.getCode())
&& !rc.get("status").equals(EnumRentContractStatus.INVALID.getCode())
&& !rc.get("status").equals(EnumRentContractStatus.CONTRACT_END.getCode())).count();
if (count > 0) {
return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND);
}
wxRentContractMapper.insertSelective(record);
} catch (Exception e) {
logger.error("保存租赁合同信息失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
Date date = new Date();
record.setCreatetime(date);
record.setUpdatetime(date);
try {
WxRentContract wxRentContract = new WxRentContract();
wxRentContract.setTenantId(record.getTenantId());
wxRentContract.setShopId(record.getShopId());
long count = wxRentContractMapper.queryRentContractData(wxRentContract).stream().
filter(rc -> !rc.get("status").equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode())
&& !rc.get("status").equals(EnumRentContractStatus.WAIT_SIGN.getCode())
&& !rc.get("status").equals(EnumRentContractStatus.INVALID.getCode())
&& !rc.get("status").equals(EnumRentContractStatus.CONTRACT_END.getCode())).count();
if (count > 0) {
return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND);
}
return new ResultData(Result.SUCCESS, "保存租赁合同信息成功", record);
wxRentContractMapper.insertSelective(record);
} catch (Exception e) {
logger.error("保存租赁合同信息失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}
return new ResultData(Result.SUCCESS, "保存租赁合同信息成功", record);
}
@Transactional(rollbackFor = {Exception.class})
@@ -178,12 +178,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
record.setRentalEndDate(instance.getTime());
//起租结束时间
if(!record.getStartDate().equals(record.getRentalStartDate())){
if (!record.getStartDate().equals(record.getRentalStartDate())) {
instance.clear();
instance.setTime(record.getRentalStartDate());
instance.add(Calendar.DAY_OF_MONTH, -1);
record.setEndDate(instance.getTime());
}else{
} else {
record.setEndDate(record.getStartDate());
}
@@ -661,20 +661,18 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}
}
@Override
public void exportContract(HttpServletRequest request, HttpServletResponse response, String tenantId) {
String id = request.getParameter("id");
public void exportContract(HttpServletRequest request, HttpServletResponse response, String tenantId, Long id) {
String contracType = "0";
String templatePath = null;
Map<String, Object> result = null;
if (EnumContractType.ALL.getCode().toString().equals(contracType)) {
logger.info("获取租赁及物业合同数据");
result = getRentAndPropertyInfo(id);
result.put("contractType",EnumContractType.ALL.getMessage());
if(EnumRentContractType.RENT_BY_AREA.getCode().equals(result.get("type"))){
result.put("contractType", EnumContractType.ALL.getMessage());
if (EnumRentContractType.RENT_BY_AREA.getCode().equals(result.get("type"))) {
templatePath = "contract-word-template/contract_rent_property.docx";
}else{
} else {
templatePath = "contract-word-template/contract_rent_property_by_ratio.docx";
}
logger.info("租赁及物业合同数据结果:" + result);
@@ -694,8 +692,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
return getResultDataForUpdate(record);
}
public Map<String, Object> getRentAndPropertyInfo(Stri ng id) {
logger.info("获取租赁物业合同数据>>>>>>id:"+id);
public Map<String, Object> getRentAndPropertyInfo(Lo ng id) {
logger.info("获取租赁物业合同数据>>>>>>id:" + id);
WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id);
WxShop record = new WxShop();
record.setId(wxRentContract.getShopId());
@@ -719,17 +717,29 @@ public class WxRentContractServiceImpl implements WxRentContractService {
result.put("operationArea", wxShop.get("operationArea"));
//商户信息
WxMerchant merchant = wxMerchantService.getById(wxRentContract.getMerchantId());
//法人信息
WxMerchantCorp wxMerchantCorp = merchant.getWxMerchantCorp();
result.put("corpPapersNumber", wxMerchantCorp.getCorpPapersNumber()!=null?wxMerchantCorp.getCorpPapersNumber():" ");
result.put("corpPapersType", wxMerchantCorp.getCorpPapersType()!=null?EnumPapersType.getEnum(wxMerchantCorp.getCorpPapersType()).getMessage():" ");
result.put("corpPapersPerson", wxMerchantCorp.getCorpPapersPerson()!=null?wxMerchantCorp.getCorpPapersPerson():" ");
//税务信息
WxMerchantTax wxMerchantTax = merchant.getWxMerchantTax();
result.put("taxPapersType", wxMerchantTax.getTaxPapersType()!=null?EnumTaxpayerType.getEnum(wxMerchantTax.getTaxPapersType()).getMessage():" ");
result.put("bankName", wxMerchantTax.getBankName()!=null?wxMerchantTax.getBankName():" ");
result.put("bankAccount", wxMerchantTax.getBankAccount()!=null?wxMerchantTax.getBankAccount():" ");
result.put("invoiceAddressPhone", wxMerchantTax.getInvoiceAddressPhone()!=null?wxMerchantTax.getInvoiceAddressPhone():" ");
if (merchant!=null) {
//法人信息
WxMerchantCorp wxMerchantCorp = merchant.getWxMerchantCorp();
result.put("corpPapersNumber", wxMerchantCorp.getCorpPapersNumber() != null ? wxMerchantCorp.getCorpPapersNumber() : " ");
result.put("corpPapersType", wxMerchantCorp.getCorpPapersType() != null ? EnumPapersType.getEnum(wxMerchantCorp.getCorpPapersType()).getMessage() : " ");
result.put("corpPapersPerson", wxMerchantCorp.getCorpPapersPerson() != null ? wxMerchantCorp.getCorpPapersPerson() : " ");
//税务信息
WxMerchantTax wxMerchantTax = merchant.getWxMerchantTax();
result.put("taxPapersType", wxMerchantTax.getTaxPapersType() != null ? EnumTaxpayerType.getEnum(wxMerchantTax.getTaxPapersType()).getMessage() : " ");
result.put("bankName", wxMerchantTax.getBankName() != null ? wxMerchantTax.getBankName() : " ");
result.put("bankAccount", wxMerchantTax.getBankAccount() != null ? wxMerchantTax.getBankAccount() : " ");
result.put("invoiceAddressPhone", wxMerchantTax.getInvoiceAddressPhone() != null ? wxMerchantTax.getInvoiceAddressPhone() : " ");
} else {
//法人信息
result.put("corpPapersNumber", " ");
result.put("corpPapersType", " ");
result.put("corpPapersPerson", " ");
//税务信息
result.put("taxPapersType", " ");
result.put("bankName", " ");
result.put("bankAccount", " ");
result.put("invoiceAddressPhone", " ");
}
//租赁合同信息
String rentalStartDate = DateUtils.date2String(wxRentContract.getRentalStartDate(), "yyyy-MM-dd");
result.put("rentalStartDate", rentalStartDate);
@@ -750,35 +760,35 @@ public class WxRentContractServiceImpl implements WxRentContractService {
result.put("payAccount", wxRentContract.getPayAccount().equals("") ? " " : wxRentContract.getPayAccount());
result.put("signDate", DateUtils.date2String(wxRentContract.getSignDate(), "yyyy-MM-dd"));
result.put("brand", wxRentContract.getBrand());
double adjustRatio = wxRentContract.getAdjustRatio()!=null?wxRentContract.getAdjustRatio() / 100.0:0;
double adjustRatio = wxRentContract.getAdjustRatio() != null ? wxRentContract.getAdjustRatio() / 100.0 : 0;
result.put("adjustRatio", adjustRatio);
double priceRent = new BigDecimal(wxRentContract.getPrice())
.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
result.put("priceRent",priceRent);
result.put("priceRent", priceRent);
double unitPrice = new BigDecimal(wxRentContract.getPrice())
.divide(new BigDecimal(wxRentContract.getRentArea()),2,RoundingMode.HALF_EVEN)
.divide(new BigDecimal(100))
.divide(new BigDecimal(wxRentContract.getRentArea()), 2, RoundingMode.HALF_EVEN)
.divide(new BigDecimal(100))
.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
result.put("unitPriceRent", unitPrice);
result.put("priceRentUpper",digitUppercase(priceRent));
result.put("priceRentUpper", digitUppercase(priceRent));
result.put("unitPriceRentUpper", digitUppercase(unitPrice));
//租赁保证金
int cashDepositMonthRent=3;
int cashDepositMonthRent = 3;
double cashDepositRent = new BigDecimal(wxRentContract.getPrice()).multiply(new BigDecimal(cashDepositMonthRent))
.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
result.put("cashDepositMonthRent", cashDepositMonthRent);
result.put("cashDepositRent", cashDepositRent);
result.put("cashDepositRentUpper", digitUppercase(cashDepositRent));
result.put("type",wxRentContract.getType());
result.put("type", wxRentContract.getType());
int extralease = lease % 12;
int extracount = extralease > 0 ? 1 : 0;
int paycount = lease / 12 + extracount;
int index = 10-paycount;
int count=paycount-1;
int index = 10 - paycount;
int count = paycount - 1;
BigDecimal rentPrice = new BigDecimal(priceRent);
if(wxRentContract.getType().equals(EnumRentContractType.RENT_BY_AREA.getCode())){
if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_AREA.getCode())) {
areaWay(wxRentContract, result, lease, adjustRatio, extralease, extracount, paycount, index, count, rentPrice);
}else{
} else {
ratioWay(wxRentContract, result, lease, adjustRatio, extralease, extracount, paycount, index, count, rentPrice);
}
//物业合同信息
@@ -791,20 +801,20 @@ public class WxRentContractServiceImpl implements WxRentContractService {
&& !rc.get("status").equals(EnumRentContractStatus.INVALID.getCode())
&& !rc.get("status").equals(EnumRentContractStatus.CONTRACT_END.getCode())).findFirst();
Map<String, Object> wxPropertyContract = null;
if(first.isPresent()){
if (first.isPresent()) {
wxPropertyContract = first.get();
}
if(wxPropertyContract!=null){
Integer receivePeriodProperty = (Integer)wxPropertyContract.get("receivePeriod");
result.put("receivePeriodProperty",receivePeriodProperty);
if (wxPropertyContract != null) {
Integer receivePeriodProperty = (Integer) wxPropertyContract.get("receivePeriod");
result.put("receivePeriodProperty", receivePeriodProperty);
double priceProperty = new BigDecimal(wxPropertyContract.get("price").toString())
.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
result.put("priceProperty",priceProperty);
result.put("priceProperty", priceProperty);
double unitPriceProperty = new BigDecimal(wxPropertyContract.get("price").toString())
.divide(new BigDecimal(wxRentContract.getRentArea())
.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN)).doubleValue();
result.put("unitPriceProperty", unitPriceProperty);
result.put("pricePropertyUpper",digitUppercase(priceProperty));
result.put("pricePropertyUpper", digitUppercase(priceProperty));
result.put("unitPricePropertyUpper", digitUppercase(unitPriceProperty));
//首期物业费
Calendar instance = Calendar.getInstance();
@@ -812,7 +822,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
instance.add(Calendar.MONTH, 0);
Date starttime = instance.getTime();
String startdate = DateUtils.date2String(starttime, "yyyy-MM-dd");
result.put("rentalStartDateProperty",startdate);
result.put("rentalStartDateProperty", startdate);
result.put("rentalStartDateYearProperty", startdate.substring(0, 4));
result.put("rentalStartDateMonthProperty", startdate.substring(5, 7));
result.put("rentalStartDateDayProperty", startdate.substring(8));
@@ -823,19 +833,19 @@ public class WxRentContractServiceImpl implements WxRentContractService {
instance.add(Calendar.DAY_OF_MONTH, -1);
Date endtime = instance.getTime();
String enddate = DateUtils.date2String(endtime, "yyyy-MM-dd");
result.put("rentalEndDateProperty",enddate);
result.put("rentalEndDateProperty", enddate);
result.put("rentalEndDateYearProperty", enddate.substring(0, 4));
result.put("rentalEndDateMonthProperty", enddate.substring(5, 7));
result.put("rentalEndDateDayProperty", enddate.substring(8));
double pricePropertyFirst = new BigDecimal(priceProperty)
.multiply(new BigDecimal(receivePeriodProperty))
.setScale(2,RoundingMode.HALF_EVEN).doubleValue();
result.put("pricePropertyFirst",pricePropertyFirst);
result.put("pricePropertyFirstUpper",digitUppercase(pricePropertyFirst));
.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
result.put("pricePropertyFirst", pricePropertyFirst);
result.put("pricePropertyFirstUpper", digitUppercase(pricePropertyFirst));
//物业保证金
int cashDepositMonthProperty=3;
int cashDepositMonthProperty = 3;
double cashDepositProperty = new BigDecimal(wxPropertyContract.get("price").toString()).multiply(new BigDecimal(cashDepositMonthProperty))
.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
result.put("cashDepositMonthProperty", cashDepositMonthProperty);
@@ -843,24 +853,24 @@ public class WxRentContractServiceImpl implements WxRentContractService {
result.put("cashDepositPropertyUpper", digitUppercase(cashDepositProperty));
}else{
result.put("receivePeriodProperty"," ");
result.put("priceProperty"," ");
} else {
result.put("receivePeriodProperty", " ");
result.put("priceProperty", " ");
result.put("unitPriceProperty", " ");
result.put("pricePropertyUpper"," ");
result.put("pricePropertyUpper", " ");
result.put("unitPricePropertyUpper", " ");
//首期物业费
result.put("rentalStartDateProperty"," ");
result.put("rentalStartDateProperty", " ");
result.put("rentalStartDateYearProperty", " ");
result.put("rentalStartDateMonthProperty", " ");
result.put("rentalStartDateDayProperty"," ");
result.put("rentalStartDateDayProperty", " ");
//结束时间
result.put("rentalEndDateProperty"," ");
result.put("rentalEndDateProperty", " ");
result.put("rentalEndDateYearProperty", " ");
result.put("rentalEndDateMonthProperty"," ");
result.put("rentalEndDateMonthProperty", " ");
result.put("rentalEndDateDayProperty", " ");
result.put("pricePropertyFirst"," ");
result.put("pricePropertyFirstUpper"," ");
result.put("pricePropertyFirst", " ");
result.put("pricePropertyFirstUpper", " ");
//物业保证金
result.put("cashDepositMonthProperty", " ");
result.put("cashDepositProperty", " ");
@@ -871,21 +881,21 @@ public class WxRentContractServiceImpl implements WxRentContractService {
return result;
}
public void ratioWay(WxRentContract wxRentContract, Map<String,Object> result, Integer lease, double adjustRatio, int extralease, int extracount, int paycount, int index, int count, BigDecimal rentPrice) {
public void ratioWay(WxRentContract wxRentContract, Map<String, Object> result, Integer lease, double adjustRatio, int extralease, int extracount, int paycount, int index, int count, BigDecimal rentPrice) {
double payRatio = wxRentContract.getPayRatio()!=null?wxRentContract.getPayRatio() / 100.0:0;
double payRatio = wxRentContract.getPayRatio() != null ? wxRentContract.getPayRatio() / 100.0 : 0;
//常规租期
for (int i = 0; i < count; i++) {
//开始时间
Calendar instance = Calendar.getInstance();
instance.setTime(wxRentContract.getRentalStartDate());
instance.add(Calendar.MONTH, lease*i);
instance.add(Calendar.MONTH, lease * i);
Date starttime = instance.getTime();
String startdate = DateUtils.date2String(starttime, "yyyy-MM-dd");
result.put("rentalStartDate"+i,startdate);
result.put("rentalStartDateYear"+i, startdate.substring(0, 4));
result.put("rentalStartDateMonth"+i, startdate.substring(5, 7));
result.put("rentalStartDateDay"+i, startdate.substring(8));
result.put("rentalStartDate" + i, startdate);
result.put("rentalStartDateYear" + i, startdate.substring(0, 4));
result.put("rentalStartDateMonth" + i, startdate.substring(5, 7));
result.put("rentalStartDateDay" + i, startdate.substring(8));
//结束时间
instance.clear();
instance.setTime(starttime);
@@ -893,26 +903,26 @@ public class WxRentContractServiceImpl implements WxRentContractService {
instance.add(Calendar.DAY_OF_MONTH, -1);
Date endtime = instance.getTime();
String enddate = DateUtils.date2String(endtime, "yyyy-MM-dd");
result.put("rentalEndDate"+i,enddate);
result.put("rentalEndDateYear"+i, enddate.substring(0, 4));
result.put("rentalEndDateMonth"+i, enddate.substring(5, 7));
result.put("rentalEndDateDay"+i, enddate.substring(8));
result.put("adjustRatio"+i,adjustRatio);
result.put("adjustPeriod"+i,wxRentContract.getAdjustPeriod());
result.put("payRatio"+i,payRatio );
result.put("rentalEndDate" + i, enddate);
result.put("rentalEndDateYear" + i, enddate.substring(0, 4));
result.put("rentalEndDateMonth" + i, enddate.substring(5, 7));
result.put("rentalEndDateDay" + i, enddate.substring(8));
result.put("adjustRatio" + i, wxRentContr act.getA djustRatio() );
result.put("adjustPeriod" + i, wxRentContract.getAdjustPeriod());
result.put("payRatio" + i, wxRentContract.getPayRatio() );
}
if(extracount>0){
if (extracount > 0) {
//额外租期
//开始时间
Calendar instance = Calendar.getInstance();
instance.setTime(wxRentContract.getRentalStartDate());
instance.add(Calendar.MONTH, lease*count);
instance.add(Calendar.MONTH, lease * count);
Date starttime = instance.getTime();
String startdate = DateUtils.date2String(starttime, "yyyy-MM-dd");
result.put("rentalStartDate"+count,startdate);
result.put("rentalStartDateYear"+count, startdate.substring(0, 4));
result.put("rentalStartDateMonth"+count, startdate.substring(5, 7));
result.put("rentalStartDateDay"+count, startdate.substring(8));
result.put("rentalStartDate" + count, startdate);
result.put("rentalStartDateYear" + count, startdate.substring(0, 4));
result.put("rentalStartDateMonth" + count, startdate.substring(5, 7));
result.put("rentalStartDateDay" + count, startdate.substring(8));
//结束时间
instance.clear();
instance.setTime(starttime);
@@ -920,28 +930,28 @@ public class WxRentContractServiceImpl implements WxRentContractService {
instance.add(Calendar.DAY_OF_MONTH, -1);
Date endtime = instance.getTime();
String enddate = DateUtils.date2String(endtime, "yyyy-MM-dd");
result.put("rentalEndDate"+count,enddate);
result.put("rentalEndDateYear"+count, enddate.substring(0, 4));
result.put("rentalEndDateMonth"+count, enddate.substring(5, 7));
result.put("rentalEndDateDay"+count, enddate.substring(8));
result.put("adjustRatio"+count,adjustRatio);
result.put("adjustPeriod"+count,wxRentContract.getAdjustPeriod());
result.put("payRatio"+count,payRatio );
result.put("rentalEndDate" + count, enddate);
result.put("rentalEndDateYear" + count, enddate.substring(0, 4));
result.put("rentalEndDateMonth" + count, enddate.substring(5, 7));
result.put("rentalEndDateDay" + count, enddate.substring(8));
result.put("adjustRatio" + count, wxRentContr act.getA djustRatio() );
result.put("adjustPeriod" + count, wxRentContract.getAdjustPeriod());
result.put("payRatio" + count, wxRentContract.getPayRatio() );
}
//无数据租期
for(int i=paycount;i<index;i++){
result.put("rentalStartDate"+i,"/");
result.put("rentalStartDateYear"+i, "/");
result.put("rentalStartDateMonth"+i, "/");
result.put("rentalStartDateDay"+i, "/");
result.put("rentalEndDate"+i,"/");
result.put("rentalEndDateYear"+i, "/");
result.put("rentalEndDateMonth"+i, "/");
result.put("rentalEndDateDay"+i, "/");
result.put("adjustRatio"+i,"/");
result.put("adjustPeriod"+i,"/");
result.put("payRatio"+i,"/");
for (int i = paycount; i < index; i++) {
result.put("rentalStartDate" + i, "/");
result.put("rentalStartDateYear" + i, "/");
result.put("rentalStartDateMonth" + i, "/");
result.put("rentalStartDateDay" + i, "/");
result.put("rentalEndDate" + i, "/");
result.put("rentalEndDateYear" + i, "/");
result.put("rentalEndDateMonth" + i, "/");
result.put("rentalEndDateDay" + i, "/");
result.put("adjustRatio" + i, "/");
result.put("adjustPeriod" + i, "/");
result.put("payRatio" + i, "/");
}
}
@@ -951,13 +961,13 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//开始时间
Calendar instance = Calendar.getInstance();
instance.setTime(wxRentContract.getRentalStartDate());
instance.add(Calendar.MONTH, lease*i);
instance.add(Calendar.MONTH, lease * i);
Date starttime = instance.getTime();
String startdate = DateUtils.date2String(starttime, "yyyy-MM-dd");
result.put("rentalStartDate"+i,startdate);
result.put("rentalStartDateYear"+i, startdate.substring(0, 4));
result.put("rentalStartDateMonth"+i, startdate.substring(5, 7));
result.put("rentalStartDateDay"+i, startdate.substring(8));
result.put("rentalStartDate" + i, startdate);
result.put("rentalStartDateYear" + i, startdate.substring(0, 4));
result.put("rentalStartDateMonth" + i, startdate.substring(5, 7));
result.put("rentalStartDateDay" + i, startdate.substring(8));
//结束时间
instance.clear();
instance.setTime(starttime);
@@ -965,29 +975,29 @@ public class WxRentContractServiceImpl implements WxRentContractService {
instance.add(Calendar.DAY_OF_MONTH, -1);
Date endtime = instance.getTime();
String enddate = DateUtils.date2String(endtime, "yyyy-MM-dd");
result.put("rentalEndDate"+i,enddate);
result.put("rentalEndDateYear"+i, enddate.substring(0, 4));
result.put("rentalEndDateMonth"+i, enddate.substring(5, 7));
result.put("rentalEndDateDay"+i, enddate.substring(8));
if(i>0){
result.put("rentalEndDate" + i, enddate);
result.put("rentalEndDateYear" + i, enddate.substring(0, 4));
result.put("rentalEndDateMonth" + i, enddate.substring(5, 7));
result.put("rentalEndDateDay" + i, enddate.substring(8));
if (i > 0) {
rentPrice = rentPrice.multiply(new BigDecimal(adjustRatio))
.add(rentPrice).setScale(2, RoundingMode.HALF_EVEN);
result.put("priceRentUpper"+i,digitUppercase(rentPrice.doubleValue()));
result.put("priceRent"+i,digitUppercase(rentPrice.doubleValue()));
result.put("priceRentUpper" + i, digitUppercase(rentPrice.doubleValue()));
result.put("priceRent" + i, digitUppercase(rentPrice.doubleValue()));
}
}
if(extracount>0){
if (extracount > 0) {
//额外租期
//开始时间
Calendar instance = Calendar.getInstance();
instance.setTime(wxRentContract.getRentalStartDate());
instance.add(Calendar.MONTH, lease*count);
instance.add(Calendar.MONTH, lease * count);
Date starttime = instance.getTime();
String startdate = DateUtils.date2String(starttime, "yyyy-MM-dd");
result.put("rentalStartDate"+count,startdate);
result.put("rentalStartDateYear"+count, startdate.substring(0, 4));
result.put("rentalStartDateMonth"+count, startdate.substring(5, 7));
result.put("rentalStartDateDay"+count, startdate.substring(8));
result.put("rentalStartDate" + count, startdate);
result.put("rentalStartDateYear" + count, startdate.substring(0, 4));
result.put("rentalStartDateMonth" + count, startdate.substring(5, 7));
result.put("rentalStartDateDay" + count, startdate.substring(8));
//结束时间
instance.clear();
instance.setTime(starttime);
@@ -995,29 +1005,29 @@ public class WxRentContractServiceImpl implements WxRentContractService {
instance.add(Calendar.DAY_OF_MONTH, -1);
Date endtime = instance.getTime();
String enddate = DateUtils.date2String(endtime, "yyyy-MM-dd");
result.put("rentalEndDate"+count,enddate);
result.put("rentalEndDateYear"+count, enddate.substring(0, 4));
result.put("rentalEndDateMonth"+count, enddate.substring(5, 7));
result.put("rentalEndDateDay"+count, enddate.substring(8));
result.put("rentalEndDate" + count, enddate);
result.put("rentalEndDateYear" + count, enddate.substring(0, 4));
result.put("rentalEndDateMonth" + count, enddate.substring(5, 7));
result.put("rentalEndDateDay" + count, enddate.substring(8));
rentPrice = rentPrice.multiply(new BigDecimal(adjustRatio))
.add(rentPrice).setScale(2, RoundingMode.HALF_EVEN);
result.put("priceRentUpper"+count,digitUppercase(rentPrice.doubleValue()));
result.put("priceRent"+count,digitUppercase(rentPrice.doubleValue()));
result.put("priceRentUpper" + count, digitUppercase(rentPrice.doubleValue()));
result.put("priceRent" + count, digitUppercase(rentPrice.doubleValue()));
}
//无数据租期
for(int i=paycount;i<index;i++){
result.put("rentalStartDate"+i,"/");
result.put("rentalStartDateYear"+i, "/");
result.put("rentalStartDateMonth"+i, "/");
result.put("rentalStartDateDay"+i, "/");
result.put("rentalEndDate"+i,"/");
result.put("rentalEndDateYear"+i, "/");
result.put("rentalEndDateMonth"+i, "/");
result.put("rentalEndDateDay"+i, "/");
result.put("priceRentUpper"+i,"/");
result.put("priceRent"+i,"/");
for (int i = paycount; i < index; i++) {
result.put("rentalStartDate" + i, "/");
result.put("rentalStartDateYear" + i, "/");
result.put("rentalStartDateMonth" + i, "/");
result.put("rentalStartDateDay" + i, "/");
result.put("rentalEndDate" + i, "/");
result.put("rentalEndDateYear" + i, "/");
result.put("rentalEndDateMonth" + i, "/");
result.put("rentalEndDateDay" + i, "/");
result.put("priceRentUpper" + i, "/");
result.put("priceRent" + i, "/");
}
}
@@ -1074,7 +1084,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
public static void main(String[] args) {
BigDecimal multiply = new BigDecimal(8059.99).multiply(new BigDecimal(0.07));
BigDecimal add = multiply.add(new BigDecimal(8059.99)).setScale(2,RoundingMode.HALF_EVEN);
BigDecimal add = multiply.add(new BigDecimal(8059.99)).setScale(2, RoundingMode.HALF_EVEN);
System.out.println(add.doubleValue());
}