累计总收入bugfix

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

@@ -242,16 +242,14 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
             contract.setAdjustmentFund(0L);
             contract.setIncomeShareAll(contract.getIntervaIncomeShare());
 
-            DateTime grossDate;
             if(checkTwoTime(selected[0],contractPart[1]) && checkTwoTime(contractPart[1],selected[1])){
-                grossDate = contractPart[1];
+                contract.setIncomeGross(contract.getIncomeExcludingTax());
             }else{
-                grossDate = selected[1];
-            }
                 //累计总收入
-            clickNum = accountFlowRestrictService.getTotalNum(contractPart[0].toString("yyyy-MM-dd"), grossDate.toString("yyyy-MM-dd"), appkeyStr, "account_track_flow_restrict", "click_sum");
+                clickNum = accountFlowRestrictService.getTotalNum(contractPart[0].toString("yyyy-MM-dd"), selected[1].toString("yyyy-MM-dd"), appkeyStr, "account_track_flow_restrict", "click_sum");
                 clickFlow = clickNum==null?0:clickNum.intValue();
                 contract.setIncomeGross(unitPriceAccurate.multiply(new BigDecimal(clickFlow / 10000.0 * 100)).setScale(0, BigDecimal.ROUND_HALF_UP).longValue());
+            }
 
             isLater = false;
         } else if (selected[1].isBefore(creatPoints[1])) {
@@ -298,17 +296,15 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
                 contract.setAdjustmentFund(0L);
             }
 
-            DateTime grossDate;
             if(checkTwoTime(selected[0],contractPart[1]) && checkTwoTime(contractPart[1],selected[1])){
-                grossDate = contractPart[1];
+                contract.setIncomeGross(contract.getIncomeExcludingTax());
             }else{
-                grossDate = selected[1];
-            }
                 //累计总收入
-            clickNum = accountFlowRestrictService.getTotalNum(contractPart[0].toString("yyyy-MM-dd"), grossDate.toString("yyyy-MM-dd"), appkeyStr, "account_track_flow_restrict", "click_sum");
+                clickNum = accountFlowRestrictService.getTotalNum(contractPart[0].toString("yyyy-MM-dd"), selected[1].toString("yyyy-MM-dd"), appkeyStr, "account_track_flow_restrict", "click_sum");
                 clickFlow = clickNum==null?0:clickNum.intValue();
                 contract.setIncomeGross(unitPriceAccurate.multiply(new BigDecimal(clickFlow / 10000.0 * 100)).setScale(0, BigDecimal.ROUND_HALF_UP).longValue());
             }
+        }
 
         if (checkTwoTime(contractPart[1], selected[1])) {
             //最后一日分摊收入计算处理(合同的最后一天，不管流量剩余多少，都算作做最后一天的收入)
@@ -396,16 +392,14 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
         contract.setIntervaIncomeShare(share);
         contract.setIncomeShareAll(share+adjustmentFund);
 
-        DateTime grossDate;
         if(checkTwoTime(selected[0],contractPart[1]) && checkTwoTime(contractPart[1],selected[1])){
-            grossDate = contractPart[1];
+            contract.setIncomeGross(contract.getIncomeExcludingTax());
         }else{
-            grossDate = selected[1];
-        }
             //累计总收入
-        clickNum = accountFlowRestrictService.getTotalNum(contractPart[0].toString("yyyy-MM-dd"), grossDate.toString("yyyy-MM-dd"), appkeys, "account_track_flow_restrict", "click_sum");
+            clickNum = accountFlowRestrictService.getTotalNum(contractPart[0].toString("yyyy-MM-dd"), selected[1].toString("yyyy-MM-dd"), appkeys, "account_track_flow_restrict", "click_sum");
             clickFlow = clickNum==null?0:clickNum.intValue();
             contract.setIncomeGross(unitPriceAccurate.multiply(new BigDecimal(clickFlow / 10000.0 * 100)).setScale(0, BigDecimal.ROUND_HALF_UP).longValue());
+        }
         return contract;
     }