bugfix

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

@@ -389,6 +389,15 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
                                                 create, //录入日
                                                 create.dayOfMonth().withMinimumValue() //录入月1日
                                         };
+                                    if(selected[1].isBefore(contractPart[0])){
+                                        contract.setUnitPrice(0.0);
+                                        contract.setIntervaIncomeShare(0L);
+                                        contract.setAdjustmentFund(0L);
+                                        contract.setIncomeShareAll(contract.getIntervaIncomeShare());
+                                        contract.setClickFlow(0.0);
+                                        contract.setIncomeGross(0L);
+                                        contracts.remove(contract);//移出列表
+                                    }else
                                     if(!contract.getPriceLevel().equals(Constant.tkioPriceLevelNotLimit)){
                                         boolean isLater = true;
                                         if(!isLateContract){//正常合同
@@ -551,6 +560,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
                                         int contractAllDay = getDayRange(contractPart[0], contractPart[1]) + 1;//合同总天数
                                         BigDecimal dayShareIncome = new BigDecimal(totalprice/contractAllDay)
                                                 .setScale(16, BigDecimal.ROUND_HALF_UP);
+
                                         contract.setUnitPrice(dayShareIncome.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());//设置不限量套餐的单价
                                         int betweenMonth = Months.monthsBetween(contractPart[0], creatPoints[0]).getMonths();
                                         //时间范围内用于计算分摊金额的天数