分摊金处理

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

@@ -82,8 +82,8 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
             }
         }
 
-        contracts = new ArrayList<>();
-        contracts.add(contractRepository.findOne(1355L));
+        /*contracts = new ArrayList<>();
+        contracts.add(contractRepository.findOne(1355L));*/
 
         List<ContractBody> bodies = contractBodyRepository.findAll();
         Map<String, String> bodiesNameMap = bodies.stream().collect(
@@ -113,6 +113,8 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
                 selected[1].compareTo(contractPart[1]) >= 0 ? contractPart[1] : selected[1]
         };
 
+        /*DateTime[][] mainTimes = new DateTime[][]{selected, contractPart, usePart};*/
+
         contract.setIntervalUseDays(getDayRange(contractPart[0], usePart[1]) + 1);
 
         Long excludTax = contract.getMoney() * 94;//不含税收入*100
@@ -121,7 +123,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
 
         //处理精度
         Long dayShareIncome = new BigDecimal(contract.getMoney() * 94 * 1.0 / contractAllDay)
-                .setScale(0, BigDecimal.ROUND_HALF_UP).longValue();//每日分摊收入
+                .setScale(0, BigDecimal.ROUND_HALF_UP).longValue();//每日分摊收入(值扩大100倍)
 
         //作废合同处理
         Contract cancleContract = this.cancledShare(contract, contractAllDay, dayShareIncome, contractPart, usePart, selected);
@@ -150,7 +152,6 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
     private void afterContract(Contract contract, int contractAllDay, Long dayShareIncome,
                                DateTime[] contractPart, DateTime[] usePart, DateTime[] selected, DateTime[] creatPoints) {
 
-
         int betweenMonth = creatPoints[0].getMonthOfYear() - contractPart[0].getMonthOfYear();
         //时间范围内用于计算分摊金额的天数
         int daysIncom = getDayRange(usePart[0], usePart[1]) + 1;
@@ -158,9 +159,19 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
         contract.setIntervaIncomeShare(dayShareIncome * daysIncom);
 
         Long adjustmentFund = 0L;//调整金
-        int aferDays = contractPart[0].monthOfYear().get() == 12 ? 29 : 9;
-        if (!ContractStatusEnum.LATE.getKey().equals(contract.getStatus()) ||
-                !checkLateContract(contractPart[0], creatPoints[0]) || betweenMonth < 1) {
+
+        boolean isLateContract = false; // 是否为晚录合同（为了兼容历史数据 此处做冗余判断）
+        if (ContractStatusEnum.LATE.getKey().equals(contract.getStatus())) {
+            isLateContract = true;
+        } else if (checkLateContract(contractPart[0], creatPoints[0])) {
+            isLateContract = true;
+        }
+
+        if (isLateContract) {
+            contract.setStatus(ContractStatusEnum.LATE.getKey());
+        }
+
+        if (!isLateContract || betweenMonth < 1) {
             //非合同晚录
             contract.setAdjustmentFund(0L);
             contract.setIncomeShareAll(contract.getIntervaIncomeShare());
@@ -173,15 +184,11 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
         } else {
             contract.setStatus(ContractStatusEnum.LATE.getKey());
             //合同晚录
-            //所选时间范围内的分摊收入(录入月1号开始计算)
+            //所选时间范围内的分摊收入(录入月1号 即creatPoints[1] 开始计算)
             DateTime useStart = creatPoints[1].compareTo(selected[0]) >= 0 ? creatPoints[1] : selected[0];
             daysIncom = getDayRange(useStart, usePart[1]) + 1;
             contract.setIntervaIncomeShare(dayShareIncome * daysIncom);//时间范围内分摊金
 
-            /*adjustmentFund = new BigDecimal(((getDayRange(contractPart[0], creatPoints[1].plusDays(-1)) + 1)
-                    * contract.getIncomeExcludingTax() * 1.0 / contractAllDay))
-                    .setScale(0, BigDecimal.ROUND_HALF_UP).longValue();*/
-
             adjustmentFund = (getDayRange(contractPart[0], creatPoints[1].plusDays(-1)) + 1) * dayShareIncome;
 
             if (checkTwoTime(selected[0], creatPoints[1]) && checkTwoTime(creatPoints[1], selected[1])) {
@@ -533,6 +540,12 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
                 .setScale(0, BigDecimal.ROUND_HALF_UP).longValue();
         System.out.println(ss);
 
+        DateTime[][] times = new DateTime[][]{
+                {new DateTime(), new DateTime()},
+                {new DateTime(), new DateTime()}
+        };
+
+        System.out.println(times[1][0].toString());
 
     }
 }