Browse Source

[合同][修改][修改物业合同创建报错]

release_toaliyun_real
luozukai 6 years ago
parent
commit
d3907367d8
2 changed files with 9 additions and 11 deletions
  1. +9
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +0
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 9
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java View File

@@ -743,14 +743,18 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
return needpay;
}

SimpleDateFormat sdMR = new SimpleDateFormat("MM-dd");
SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM");
SimpleDateFormat sdD = new SimpleDateFormat("d");
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");

if(i == billTimeVoListSize - 1){//最后
if(sdMR.format(startDate).equals(sdMR.format(wxRentContract.getStartDate())) && sdMR.format(endDate).equals(sdMR.format(wxRentContract.getEndDate())) ){
int months = WxRentContractServiceImpl.getMonths(sdM.format(startDate)+"-01",sdM.format(endDate)+"-01");
months++;
//判断是否满足整月
int startInt = Integer.parseInt(sdD.format(startDate));
int endInt = Integer.parseInt(sdD.format(DateUtils.getDaySet(endDate,Calendar.DATE,1)));
if(startInt == endInt){
int months = WxRentContractServiceImpl.getMonths(sdM.format(startDate)+"-01",sdM.format(DateUtils.getDaySet(endDate,Calendar.DATE,1))+"-01");
needpay = new Double(months * priceD).longValue();
}else {
}else{
needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD, startDate, endDate)).longValue();
}
}else if(i == 0){//第一期


+ 0
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -1136,15 +1136,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
return needpay;
}

SimpleDateFormat sdMR = new SimpleDateFormat("MM-dd");
SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM");
SimpleDateFormat sdD = new SimpleDateFormat("d");
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
// System.out.println(sd.format(startDate));
System.out.println(sd.format(endDate));
if(sd.format(endDate).equals("2020-08-18")){
System.out.println();
}

if(i == billTimeVoListSize - 1){//最后
//判断是否满足整月


Loading…
Cancel
Save