演出列表搜索完善

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinPerformancesController.java

@@ -33,43 +33,43 @@ public class KylinPerformancesController {
     @GetMapping("localList")
     @ApiOperation("本地演出列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "query", dataType = "String", name = "sellTime", value = "开票时间 2021-01-01"),
-            @ApiImplicitParam(type = "query", dataType = "Integer", name = "days", value = "时间范围 几天 今天1 三天3。。。"),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "timeStart", value = "演出开始时间 2021-01-01"),
+            @ApiImplicitParam(type = "query", dataType = "int", name = "days", value = "时间范围 几天 今天1 三天3。。。"),
             @ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "演出名称"),
             @ApiImplicitParam(type = "query", dataType = "String", name = "cityName", value = "城市名称"),
-            @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧"),
+            @ApiImplicitParam(type = "query", dataType = "int", name = "type", value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧"),
 
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "isDiscount", value = "是否会员优惠 0 1"),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "isAdvance", value = "是否优先 0 1"),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "isExclusive", value = "是否会员专属 0 1"),
 
-            @ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页码"),
-            @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "每页数量"),
+            @ApiImplicitParam(type = "query", dataType = "int", name = "page", value = "页码"),
+            @ApiImplicitParam(type = "query", dataType = "int", name = "size", value = "每页数量"),
 
-            @ApiImplicitParam(type = "query", dataType = "String", name = "orderBy", value = "排序字段 时间sellTime"),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "orderBy", value = "排序字段 时间timeStart"),
             @ApiImplicitParam(type = "query", dataType = "String", name = "sort", value = "排序方式[DESC ASC]"),
     })
     public ResponseDto<HashMap<String, Object>> localList(
-            @RequestParam(defaultValue = "") String sellTime,
-            @RequestParam(defaultValue = "") Integer days,
+            @RequestParam(defaultValue = "") String timeStart,
+            @RequestParam(defaultValue = "0") int days,
             @RequestParam(defaultValue = "") String title,
             @RequestParam(defaultValue = "") String cityName,
-            @RequestParam(defaultValue = "") Integer type,
+            @RequestParam(defaultValue = "0") int type,
 
             @RequestParam(defaultValue = "") Integer isDiscount,
             @RequestParam(defaultValue = "") Integer isAdvance,
             @RequestParam(defaultValue = "") Integer isExclusive,
 
 
-            @RequestParam(defaultValue = "1") Integer page,
-            @RequestParam(defaultValue = "10") Integer size,
+            @RequestParam(defaultValue = "1") int page,
+            @RequestParam(defaultValue = "10") int size,
 
             // 排序
             @RequestParam(defaultValue = "") String orderBy,
             @RequestParam(defaultValue = "") String sort
     ) {
         HashMap<String, Object> result = kylinPerformancesService.localList(
-                sellTime, days, title, cityName, type,
+                timeStart, days, title, cityName, type,
                 isDiscount, isAdvance, isExclusive,
                 page, size,
                 orderBy, sort

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -39,9 +39,9 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
     private MongoTemplate mongoTemplate;
 
     public HashMap<String, Object> localList(
-            String sellTime, Integer days, String title, String cityName, Integer type,
+            String timeStart, int days, String title, String cityName, int type,
             Integer isDiscount, Integer isAdvance, Integer isExclusive,
-            Integer page, Integer size,
+            int page, int size,
             String orderBy, String sort
     ) {
         HashMap<String, Object> info = new HashMap<>();
@@ -57,7 +57,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
                 sortName = Sort.by(Sort.Direction.ASC, orderBy);
             }
         } else {
-            sortName = Sort.by(Sort.Direction.ASC, "sellTime");
+            sortName = Sort.by(Sort.Direction.ASC, "timeStart");
         }
 
         Pageable pageable = PageRequest.of(page - 1, size, sortName);
@@ -68,7 +68,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         if (!title.isEmpty()) {
             queryObject.put("title", Pattern.compile(title, Pattern.CASE_INSENSITIVE));
         }
-        if (type != null) {
+        if (type > 0) {
             queryObject.put("type", type);
         }
         if (isExclusive != null) {
@@ -82,22 +82,22 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         }
 
         Query query = new BasicQuery(queryObject);
-        if (!sellTime.isEmpty()) {
-            String sellTimeEnd = sellTime + " 23:59:59";
-            query.addCriteria(Criteria.where("sellTime").gte(sellTime).lte(sellTimeEnd));
+        if (!timeStart.isEmpty()) {
+            String timeStartEnd = timeStart + " 23:59:59";
+            query.addCriteria(Criteria.where("timeStart").gte(timeStart).lte(timeStartEnd));
         }
-        if (days != null) {
+        if (days > 0) {
             LocalDateTime nowTime = LocalDateTime.now();
             String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             LocalDateTime OtherTime = nowTime.plusDays(days);
             String OtherTimeStr = OtherTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-            query.addCriteria(Criteria.where("sellTime").gte(nowTimeStr).lte(OtherTimeStr));
+            query.addCriteria(Criteria.where("timeStart").gte(nowTimeStr).lte(OtherTimeStr));
         }
 
         // 固定查询条件
         LocalDateTime nowTime = LocalDateTime.now();
         String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        query.addCriteria(Criteria.where("stopSellTime").gte(nowTimeStr));
+        query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
         query.addCriteria(Criteria.where("statusSell").is(1));
 
         // 要查询的字段
@@ -124,7 +124,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         Query query = new Query();
         LocalDateTime nowTime = LocalDateTime.now();
         String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        query.addCriteria(Criteria.where("stopSellTime").gte(nowTimeStr));
+        query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
         query.addCriteria(Criteria.where("statusSell").is(1));
 
         // 今天的
@@ -132,19 +132,19 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         String toDayTimeStr = toDayTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         LocalDateTime toDayEndTime = toDayTime.plusDays(1);
         String toDayEndTimeStr = toDayEndTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        query.addCriteria(Criteria.where("sellTime").gte(toDayTimeStr).lt(toDayEndTimeStr));
+        query.addCriteria(Criteria.where("timeStart").gte(toDayTimeStr).lt(toDayEndTimeStr));
         List<PerformanceVo> toDayList = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
 
         // 三天的
         Query queryT = new Query();
         LocalDateTime nowTimeT = LocalDateTime.now();
         String nowTimeStrT = nowTimeT.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        queryT.addCriteria(Criteria.where("stopSellTime").gte(nowTimeStrT));
+        queryT.addCriteria(Criteria.where("timeEnd").gte(nowTimeStrT));
         queryT.addCriteria(Criteria.where("statusSell").is(1));
 
         LocalDateTime threeDaysLater = toDayTime.plusDays(3);
         String threeDaysLaterStr = threeDaysLater.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        queryT.addCriteria(Criteria.where("sellTime").gte(toDayEndTimeStr).lt(threeDaysLaterStr));
+        queryT.addCriteria(Criteria.where("timeStart").gte(toDayEndTimeStr).lt(threeDaysLaterStr));
         List<PerformanceVo> threeDaysList = mongoTemplate.find(queryT, PerformanceVo.class, PerformanceVo.class.getSimpleName());
 
         HashMap<String, Object> info = new HashMap<>();
@@ -158,7 +158,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         Query query = new Query();
         LocalDateTime nowTime = LocalDateTime.now();
         String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        query.addCriteria(Criteria.where("stopSellTime").gte(nowTimeStr));
+        query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
         query.addCriteria(Criteria.where("statusSell").is(1));
         // 推荐
         query.addCriteria(Criteria.where("isRecommend").is(1));