开发更新

jiangping

2024-11-27 0b026ebc1bf642a9d9c094ede94b9400f1e5f266

开发更新

 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.addMonthToDate(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.addMonthToDate(startDate,monthThree));
            list.add(DateUtil.addMonthToDate(startDate,monthThree*3));
        }
        return list;
    }
@@ -712,10 +712,11 @@
    private void dealCircleDateBillBiz(  List<Date> dateList ,YwContract model, YwContractDetail d, Date freeStart, Date freeEnd, List<YwContractBill> list ) {
        int temp = 0;
        for(Date start : dateList){
            Date end = model.getEndDate();
            Date end = d.getEndDate();
            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);//账单结束
@@ -726,7 +727,7 @@
            bill.setReceivableFee(totalFee);
            bill.setBillType(Constants.ZERO);

            temp++;

            bill.setCompanyId(model.getCompanyId());
            list.add(bill);
        }