Merge branch 'dev_merchant' into pre

liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/util/MongoSlimeUtils.java

@@ -266,7 +266,7 @@ public class MongoSlimeUtils {
         return docTicket;
     }
 
-    public HashMap<String,Object> getPerformanceList(PerformancePartnerListParam performancePartnerListParam) {
+    public HashMap<String, Object> getPerformanceList(PerformancePartnerListParam performancePartnerListParam) {
         performancePartnerListParam.setOrderType(performancePartnerListParam.getOrderType());
         //分页排序
         Sort.Direction orderBy = Sort.Direction.DESC;
@@ -290,7 +290,7 @@ public class MongoSlimeUtils {
                     SlimeAuthorizationPerformanceVo.class, SlimeAuthorizationPerformanceVo.class.getSimpleName());
             performanceIdList = permissionVoList.stream().map(SlimeAuthorizationPerformanceVo::getPerformanceId).collect(Collectors.toList());
         }
-        log.debug("TIME 1= "+ (System.currentTimeMillis()-currentTime));
+        log.debug("TIME 1= " + (System.currentTimeMillis() - currentTime));
         currentTime = System.currentTimeMillis();
         //查询演出
         Criteria criteriaPerformanceId = performanceIdList == null ? Criteria.where("performancesId").ne(null) : Criteria.where("performancesId").in(performanceIdList);
@@ -316,15 +316,16 @@ public class MongoSlimeUtils {
                         .skip(((performancePartnerListParam.getPage() - 1) * performancePartnerListParam.getSize()))
                         .limit(performancePartnerListParam.getSize()),
                 KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
-        log.debug("TIME 2= "+ (System.currentTimeMillis()-currentTime));
+        log.debug("TIME 2= " + (System.currentTimeMillis() - currentTime));
         currentTime = System.currentTimeMillis();
         long total = mongoTemplate.count(
                 Query.query(new Criteria().andOperator(criteria).orOperator(criteriaPerformanceId, Criteria.where("merchantId").is(performancePartnerListParam.getMerchantId())))
                         .with(Sort.by(orderBy, performancePartnerListParam.getOrderItem())),
                 KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
-        log.debug("TIME 3= "+ (System.currentTimeMillis()-currentTime));
+        log.debug("TIME 3= " + (System.currentTimeMillis() - currentTime));
         currentTime = System.currentTimeMillis();
         //查询销量
+        performanceIdList = performanceVos.stream().map(KylinPerformanceVo::getPerformancesId).collect(Collectors.toList());
         Aggregation aggregation = Aggregation.newAggregation(
                 Aggregation.match(Criteria.where("status").in(0, 1, 3, 6).and("couponType").is("no").and("transferStatus").in(0, 1, 2, 5).and("performanceId").in(performanceIdList)),
                 Aggregation.group("performanceId")
@@ -336,12 +337,12 @@ public class MongoSlimeUtils {
 
         );
         AggregationResults<PerformancePartnerListDao> outputType = mongoTemplate.aggregate(aggregation, KylinOrderTicketVo.class.getSimpleName(), PerformancePartnerListDao.class);
-        log.debug("TIME 4= "+ (System.currentTimeMillis()-currentTime));
+        log.debug("TIME 4= " + (System.currentTimeMillis() - currentTime));
         currentTime = System.currentTimeMillis();
         List<PerformancePartnerListDao> dataList = new ArrayList(outputType.getMappedResults());
         List<PerformancePartnerListDao> list = ObjectUtil.getPerformancePartnerListDaoArrayList();
 
-       boolean isSuperAccount =  redisSlimeUtils.superAccount(performancePartnerListParam.getMerchantId());
+        boolean isSuperAccount = redisSlimeUtils.superAccount(performancePartnerListParam.getMerchantId());
         for (KylinPerformanceVo item : performanceVos) {
             boolean findData = false;
             PerformancePartnerListDao dao = PerformancePartnerListDao.getNew();
@@ -415,10 +416,10 @@ public class MongoSlimeUtils {
             }
             list.add(dao);
         }
-        log.debug("TIME 5= "+ (System.currentTimeMillis()-currentTime));
-        HashMap<String ,Object> map = CollectionUtil.mapStringObject();
-        map.put("data",list);
-        map.put("total",total);
+        log.debug("TIME 5= " + (System.currentTimeMillis() - currentTime));
+        HashMap<String, Object> map = CollectionUtil.mapStringObject();
+        map.put("data", list);
+        map.put("total", total);
         return map;
     }