主账号为空处理

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

@@ -202,7 +202,17 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
         //查出所有报表->进行代码分组，按照email分组  计算
         try (Stream<Contract> streamContract = contracts.parallelStream()) {
             streamContract.forEachOrdered(v -> {
-                multimap.put(v.getEmail(),v);
+                if(!StringUtil.isEmpty(v.getEmail())){
+                    multimap.put(v.getEmail(),v);
+                }else{
+                    v.setUnitPrice(0.0);
+                    v.setClickFlow(0.0);
+                    v.setAdjustmentFund(0L);
+                    if(checkTwoTime(new DateTime(v.getEndDate()),end)||checkTwoTime(start,new DateTime(v.getEndDate()))){
+                        v.setIntervaIncomeShare(new BigDecimal(v.getMoney()/1.06*100).setScale(0, BigDecimal.ROUND_HALF_UP).longValue());
+                        v.setIncomeGross(v.getIntervaIncomeShare());
+                    }
+                }
             });
         }
         //遍历map，找出主合同，注：补充协议不能与补充协议互相绑定
@@ -623,7 +633,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
                             }else{
                                 Contract contractMaster = contractsArray[i];
                                 if(contracts.contains(contractMaster)){
-                                    shareIncome4ContractTKIO(contractMaster,start,new DateTime(contractMaster.getNextSignedDate()));//到结束的前一天
+                                    shareIncome4ContractTKIO(contractMaster,start,checkTwoTime(new DateTime(contractMaster.getNextSignedDate()),end)?new DateTime(contractMaster.getNextSignedDate()):end);//到结束的前一天
                                 }
                             }
                         }