调整金

src/main/java/common/service/impl/ShareIncomeServiceImpl.java

@@ -83,6 +83,9 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
             }
         }
 
+        //contracts = new ArrayList<>();
+        //contracts.add(contractRepository.findOne(1361L));
+
         List<ContractBody> bodies = contractBodyRepository.findAll();
         Map<String, String> bodiesNameMap = bodies.stream().collect(
                 Collectors.toMap(ContractBody::getCode, ContractBody::getName, (v1, v2) -> v1));
@@ -91,7 +94,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
         DateTime end = new DateTime(endDate);
 
         for (Contract contract : contracts) {
-            
+
             this.caculateShareIncome(contract, start, end);
             contract.setMyBodyName(bodiesNameMap.get(contract.getMyBodyCode()));
         }
@@ -162,7 +165,6 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
                 adjustmentFund = new BigDecimal((Days.daysBetween(contractStart, cancelDate).getDays() + 1) * excludTax * 1.0 / allDay)
                         .setScale(0, BigDecimal.ROUND_HALF_UP).longValue() * -1;
 
-
                 usedEnd = usedEnd.compareTo(cancelDate) <= 0 ? usedEnd : cancelDate;
                 int daysIncom = Days.daysBetween(usedStart, usedEnd).getDays() + 1;
                 daysIncom = daysIncom < 0 ? 0 : daysIncom;
@@ -210,57 +212,6 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
 
             }
 
-
-//            if (cancelDate.isBefore(start) && isCancel) {
-//                contract.setAdjustmentFund(0L);
-//                //分摊加入调整金
-//                contract.setIntervaIncomeShare(0L);
-//                return;
-//            }
-//
-//            usedEnd = cancelDate.compareTo(usedEnd) <= 0 ? cancelDate : usedEnd;
-//
-//            int daysIncom = Days.daysBetween(usedStart, usedEnd).getDays() + 1;
-//            daysIncom = daysIncom < 0 ? 0 : daysIncom;
-//            //区间分摊总收入
-//            contract.setIntervaIncomeShare(shareIncomDay * daysIncom);
-//
-//            //调整金
-//            int daysCancle = 0;
-//
-//            if (isCancel) {
-//                //合同作废
-//                daysCancle = Days.daysBetween(contractStart, usedEnd).getDays() + 1;
-//
-//            } else {
-//                //合同中止
-//                daysCancle = Days.daysBetween(usedStart, usedEnd).getDays() + 1;
-//            }
-//
-//            adjustmentFund = new BigDecimal(daysCancle * excludTax * 1.0 / allDay)
-//                    .setScale(0, BigDecimal.ROUND_HALF_UP).longValue() * -1;
-//
-//            DateTime shareEnd = cancelDate.compareTo(contractEnd) <= 0 ? cancelDate : contractEnd;
-//
-//            if (isCancel) {
-//                if (checkTwoTime(shareEnd, end)) {
-//                    contract.setAdjustmentFund(adjustmentFund);
-//                } else {
-//                    contract.setAdjustmentFund(0L);
-//                }
-//            } else {
-//
-//                if (checkTwoTime(end, usedEnd)) {
-//                    contract.setAdjustmentFund(0L);
-//                } else {
-//                    contract.setAdjustmentFund(adjustmentFund);
-//                }
-//            }
-//
-//            //分摊
-//            contract.setIntervaIncomeShare(shareIncomDay * daysIncom);
-//            contract.setIncomeShareAll(contract.getIntervaIncomeShare() + contract.getAdjustmentFund());
-
             //中止 取消 合同逻辑结束
             return;
 
@@ -340,7 +291,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
         dayShareStartDate = nextMonth == null ? contractStart : nextMonth;
 
         //最后一日  包含最后一日 时 分摊金处理
-//        adjustmentFund = adjustmentFund < 0 ? 0 : adjustmentFund;
+        //adjustmentFund = adjustmentFund < 0 ? 0 : adjustmentFund;
 
         Long lastDay = excludTax - adjustmentFund - shareIncomDay * (Days.daysBetween(dayShareStartDate, contractEnd).getDays());
         if (start.isEqual(end) && start.isEqual(contractEnd)) {
@@ -351,6 +302,8 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
             //包含最后一日 时
             contract.setIntervaIncomeShare(contract.getIntervaIncomeShare() - shareIncomDay + lastDay);
             contract.setIncomeShareAll(contract.getIntervaIncomeShare());
+        }else{
+            contract.setIncomeShareAll(contract.getIntervaIncomeShare());
         }
 
     }