记得上下班打卡 | git大法好,push需谨慎

Commit e51facc0 authored by 胡佳晨's avatar 胡佳晨

Merge branch 'dev_merchant' into pre

parents 09d37583 81a4830c
...@@ -266,7 +266,7 @@ public class MongoSlimeUtils { ...@@ -266,7 +266,7 @@ public class MongoSlimeUtils {
return docTicket; return docTicket;
} }
public HashMap<String,Object> getPerformanceList(PerformancePartnerListParam performancePartnerListParam) { public HashMap<String, Object> getPerformanceList(PerformancePartnerListParam performancePartnerListParam) {
performancePartnerListParam.setOrderType(performancePartnerListParam.getOrderType()); performancePartnerListParam.setOrderType(performancePartnerListParam.getOrderType());
//分页排序 //分页排序
Sort.Direction orderBy = Sort.Direction.DESC; Sort.Direction orderBy = Sort.Direction.DESC;
...@@ -290,7 +290,7 @@ public class MongoSlimeUtils { ...@@ -290,7 +290,7 @@ public class MongoSlimeUtils {
SlimeAuthorizationPerformanceVo.class, SlimeAuthorizationPerformanceVo.class.getSimpleName()); SlimeAuthorizationPerformanceVo.class, SlimeAuthorizationPerformanceVo.class.getSimpleName());
performanceIdList = permissionVoList.stream().map(SlimeAuthorizationPerformanceVo::getPerformanceId).collect(Collectors.toList()); 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(); currentTime = System.currentTimeMillis();
//查询演出 //查询演出
Criteria criteriaPerformanceId = performanceIdList == null ? Criteria.where("performancesId").ne(null) : Criteria.where("performancesId").in(performanceIdList); Criteria criteriaPerformanceId = performanceIdList == null ? Criteria.where("performancesId").ne(null) : Criteria.where("performancesId").in(performanceIdList);
...@@ -316,15 +316,16 @@ public class MongoSlimeUtils { ...@@ -316,15 +316,16 @@ public class MongoSlimeUtils {
.skip(((performancePartnerListParam.getPage() - 1) * performancePartnerListParam.getSize())) .skip(((performancePartnerListParam.getPage() - 1) * performancePartnerListParam.getSize()))
.limit(performancePartnerListParam.getSize()), .limit(performancePartnerListParam.getSize()),
KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName()); KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
log.debug("TIME 2= "+ (System.currentTimeMillis()-currentTime)); log.debug("TIME 2= " + (System.currentTimeMillis() - currentTime));
currentTime = System.currentTimeMillis(); currentTime = System.currentTimeMillis();
long total = mongoTemplate.count( long total = mongoTemplate.count(
Query.query(new Criteria().andOperator(criteria).orOperator(criteriaPerformanceId, Criteria.where("merchantId").is(performancePartnerListParam.getMerchantId()))) Query.query(new Criteria().andOperator(criteria).orOperator(criteriaPerformanceId, Criteria.where("merchantId").is(performancePartnerListParam.getMerchantId())))
.with(Sort.by(orderBy, performancePartnerListParam.getOrderItem())), .with(Sort.by(orderBy, performancePartnerListParam.getOrderItem())),
KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName()); KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
log.debug("TIME 3= "+ (System.currentTimeMillis()-currentTime)); log.debug("TIME 3= " + (System.currentTimeMillis() - currentTime));
currentTime = System.currentTimeMillis(); currentTime = System.currentTimeMillis();
//查询销量 //查询销量
performanceIdList = performanceVos.stream().map(KylinPerformanceVo::getPerformancesId).collect(Collectors.toList());
Aggregation aggregation = Aggregation.newAggregation( 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.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") Aggregation.group("performanceId")
...@@ -336,12 +337,12 @@ public class MongoSlimeUtils { ...@@ -336,12 +337,12 @@ public class MongoSlimeUtils {
); );
AggregationResults<PerformancePartnerListDao> outputType = mongoTemplate.aggregate(aggregation, KylinOrderTicketVo.class.getSimpleName(), PerformancePartnerListDao.class); 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(); currentTime = System.currentTimeMillis();
List<PerformancePartnerListDao> dataList = new ArrayList(outputType.getMappedResults()); List<PerformancePartnerListDao> dataList = new ArrayList(outputType.getMappedResults());
List<PerformancePartnerListDao> list = ObjectUtil.getPerformancePartnerListDaoArrayList(); List<PerformancePartnerListDao> list = ObjectUtil.getPerformancePartnerListDaoArrayList();
boolean isSuperAccount = redisSlimeUtils.superAccount(performancePartnerListParam.getMerchantId()); boolean isSuperAccount = redisSlimeUtils.superAccount(performancePartnerListParam.getMerchantId());
for (KylinPerformanceVo item : performanceVos) { for (KylinPerformanceVo item : performanceVos) {
boolean findData = false; boolean findData = false;
PerformancePartnerListDao dao = PerformancePartnerListDao.getNew(); PerformancePartnerListDao dao = PerformancePartnerListDao.getNew();
...@@ -415,10 +416,10 @@ public class MongoSlimeUtils { ...@@ -415,10 +416,10 @@ public class MongoSlimeUtils {
} }
list.add(dao); list.add(dao);
} }
log.debug("TIME 5= "+ (System.currentTimeMillis()-currentTime)); log.debug("TIME 5= " + (System.currentTimeMillis() - currentTime));
HashMap<String ,Object> map = CollectionUtil.mapStringObject(); HashMap<String, Object> map = CollectionUtil.mapStringObject();
map.put("data",list); map.put("data", list);
map.put("total",total); map.put("total", total);
return map; return map;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment