From 0b026ebc1bf642a9d9c094ede94b9400f1e5f266 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 27 十一月 2024 17:50:40 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
index 90e2bb8..c886f29 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -670,7 +670,7 @@
list.add(DateUtil.addMonthToDate(startDate,i*6));
}
if(restMonth>0 || monthDays>0){
- list.add(DateUtil.addDaysToDate(startDate,monthSix));
+ list.add(DateUtil.addMonthToDate(startDate,monthSix*6));
}
return list;
}
@@ -685,7 +685,7 @@
list.add(DateUtil.addMonthToDate(startDate,i*3));
}
if(restMonth>0 || monthDays>0){
- list.add(DateUtil.addDaysToDate(startDate,monthThree));
+ list.add(DateUtil.addMonthToDate(startDate,monthThree*3));
}
return list;
}
@@ -716,26 +716,27 @@
if(temp+1 < dateList.size()){
end =DateUtil.addDaysToDate(dateList.get(temp+1),-1);
}
+ temp++;
YwContractBill bill = initCreateBillModel(model,d );
bill.setStartDate(start);//璐﹀崟寮�濮�
bill.setEndDate(end);//璐﹀崟缁撴潫
Date planPayDate = DateUtil.addDaysToDate(bill.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1);
bill.setPlanPayDate(planPayDate.getTime()>System.currentTimeMillis()?planPayDate:new Date());
- BigDecimal totalFee =getTotalFeeByStartEnd(model,d,freeStart,freeEnd);
+ BigDecimal totalFee =getTotalFeeByStartEnd(model,d,bill,freeStart,freeEnd);
bill.setTotleFee(totalFee);
bill.setReceivableFee(totalFee);
bill.setBillType(Constants.ZERO);
- temp++;
+
bill.setCompanyId(model.getCompanyId());
list.add(bill);
}
}
- private BigDecimal getTotalFeeByStartEnd(YwContract model, YwContractDetail d,Date freeStart,Date freeEnd) {
+ private BigDecimal getTotalFeeByStartEnd(YwContract model, YwContractDetail d, YwContractBill bill,Date freeStart,Date freeEnd) {
BigDecimal totalFee = new BigDecimal(0);
- DateCompare dateCompare = DateCompare.dayCompare(d.getStartDate(),d.getEndDate(),freeStart,freeEnd);
+ DateCompare dateCompare = DateCompare.dayCompare(bill.getStartDate(),bill.getEndDate(),freeStart,freeEnd);
if(Constants.equalsInteger(d.getCircleType(),Constants.ZERO)){
//0=鍏冩瘡骞崇背澶�
int days = dateCompare.getDay();
@@ -805,7 +806,7 @@
bill.setStartDate(d.getStartDate());//璐﹀崟寮�濮�
bill.setEndDate(d.getEndDate());//璐﹀崟缁撴潫
bill.setPlanPayDate(DateUtil.addDaysToDate(bill.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1));
- bill.setTotleFee(getTotalFeeByStartEnd(model,d,freeStart,freeEnd));
+ bill.setTotleFee(getTotalFeeByStartEnd(model,d,bill,freeStart,freeEnd));
bill.setReceivableFee(bill.getTotleFee());
bill.setBillType(Constants.ZERO);
list.add(bill);
--
Gitblit v1.9.3