+套餐字段

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

@@ -54,7 +54,9 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
     private AccountRepository accountRepository;
     @Autowired
     private AccountFlowRestrictService accountFlowRestrictService;
-
+    @Autowired
+    private PackageBaseRepository packageBaseRepository;
+    
     @Override
     public List<Contract> shareIncomeList(User loginAccount, String startDate, String endDate, String platform, String bodyCode, String serchName) {
 
@@ -110,6 +112,8 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
         List<BarrioCity> barrioCities = barrioCityRepository.findAll();
         Map<Long, BarrioCity> barrioCitiesNameMap = barrioCities.stream().collect(Collectors.toMap(BarrioCity::getId, Function.identity(), (v1, v2) -> v1));
 
+        List<PackageBase> packageBases = packageBaseRepository.findByPlatAndStatus(platform, 1);
+        Map<Long, PackageBase> packageBaseMap = packageBases.stream().collect(Collectors.toMap(PackageBase::getId, Function.identity(), (v1, v2) -> v1));
 
         DateTime start = new DateTime(startDate);
         DateTime end = new DateTime(endDate);
@@ -139,6 +143,8 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
                 v.setMyBodyName(bodiesNameMap.get(v.getMyBodyCode()));
                 if(v.getBarrioId()!=null)
                 v.setBarrioName(barrioCitiesNameMap.get(barrioCitiesNameMap.get(v.getBarrioId()).getParentId()).getName());
+                if(v.getPriceLevel()!=null)
+                    v.setPriceLevelName(packageBaseMap.get(v.getPriceLevel()).getPackageName());
             });
         }
         logger.info("计算分摊收入耗时:{}", (System.currentTimeMillis() - start_));