去掉多余代码

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

@@ -146,7 +146,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
             });
         }
         if("tkio".equals(platform)){
-            shareIncome4ContractTKIO_2(contracts,start,end);
+            this.shareIncome4ContractTKIO_2(contracts,start,end);
         }else{
             try (Stream<Contract> streamContract = contracts.parallelStream()) {
                 streamContract.forEachOrdered(v -> {
@@ -264,12 +264,12 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
                     }
                 }else{//该首次签约/续约合同 绑定了补充协议合同
                     List<Contract> sideLette = contractVO.getSideLette();
-                    Boolean isNotLimit = false;
+                    /*Boolean isNotLimit = false;
                     for (Contract contract : sideLette) {
                         if(contract.getPriceLevel()==Constant.tkioPriceLevelNotLimit){
                             isNotLimit = true;
                         }
-                    }
+                    }*/
                     //补充协议按照录入时间排序->从后到前，从大到小反推计算合同
                     sideLette.add(contractVO.getMaster());
                     Contract[] contractsArray = orderByCreateTime(sideLette);
@@ -307,7 +307,6 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
                     }
 
                     //补充协议核心逻辑
-                    if(isNotLimit){//无限流量
                     //能运行到这里说明只有补充协议才会出现无限流量（最后一个），如果是主合同无限流量，就不可能有补充协议
                         for (int i = 0; i < contractsArray.length; i++) {
                             if(i>0){
@@ -340,6 +339,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
                                                 .setScale(16, BigDecimal.ROUND_HALF_UP);//当前合同的单价
                                         //四舍五入单价
                                         double unitPrice = unitPriceAccurate.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                                        contract.setUnitPrice(unitPrice);
                                         boolean isLateContract = false; // 是否为晚录合同（为了兼容历史数据 此处做冗余判断）
                                         if (ContractStatusEnum.LATE.getKey().equals(contract.getStatus())) {
                                             isLateContract = true;
@@ -618,11 +618,6 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
                                 }
                             }
                         }
-
-                    }else{//普通流量
-
-                    }
-
                 }
             }
             //多个合同其中有一个无限流量的，这组全部都走adi逻辑，否则用新需求的逻辑计算

src/main/resources/logback/dev/logback.xml

@@ -15,7 +15,7 @@
 	<logger name="org.springframework.data.jpa" level="warn"/>
 	<logger name="ch.qos.logback" level="warn"/>
 	<logger name="org.hibernate" level="warn"/>
-	<root level="info">
+	<root level="debug">
 		<appender-ref ref="stdout" />
 	</root>
 </configuration>
\ No newline at end of file