分页查询服务

src/main/java/com/gogirl/infrastructure/mapper/product/serve/BaseServeMapper.java

@@ -18,7 +18,7 @@ public interface BaseServeMapper extends BaseMapper<BaseServe> {
     IPage<BaseServe> listServeForPage(@Param("page") IPage<BaseServe> page, @Param("baseServe") BaseServe baseServe, @Param("serveIdList") List<Integer> serveIdList);
 
 
-    List<BaseServe> listLeisureServeForPage(@Param("baseServe") BaseServe baseServe, @Param("serveIdList") List<Integer> serveIdList, @Param("time") String time, @Param("week") Integer week);
+    IPage<BaseServe> listLeisureServeForPage(@Param("page") IPage<BaseServe> page, @Param("baseServe") BaseServe baseServe, @Param("serveIdList") List<Integer> serveIdList, @Param("time") String time, @Param("week") Integer week);
 
 
     BaseServe getAggregate(Integer id);

src/main/java/com/gogirl/interfaces/product/serve/ServeController.java

@@ -2,14 +2,13 @@ package com.gogirl.interfaces.product.serve;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gogirl.application.product.serve.BaseProduceService;
+import com.beust.jcommander.internal.Lists;
 import com.gogirl.application.product.serve.BaseServeService;
-import com.gogirl.application.xcx.GogirlTokenService;
 import com.gogirl.domain.product.serve.BaseServe;
 import com.gogirl.infrastructure.common.base.JsonResult;
-import com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigMapper;
+import com.gogirl.infrastructure.common.util.DateUtils;
+import com.gogirl.infrastructure.common.util.StringUtils;
 import com.gogirl.infrastructure.mapper.product.serve.BaseServeMapper;
-import com.gogirl.infrastructure.mapper.product.serve.PraiseRecordMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -18,6 +17,10 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @Api(tags = {"预约服务接口"}, value = "预约服务接口")
@@ -26,12 +29,45 @@ import java.time.LocalDateTime;
 public class ServeController {
 
     private final BaseServeService baseServeService;
-    private final BaseProduceService baseProduceService;
-    private final GogirlTokenService tokenService;
-    private final PraiseRecordMapper praiseRecordMapper;
-    private final LeisureDiscountConfigMapper leisureDiscountConfigMapper;
     private final BaseServeMapper baseServeMapper;
 
+    @ApiOperation(value = "查看服务列表")
+    @GetMapping("/customer/serve/no_queryServeForPage")
+    @Deprecated
+    public JsonResult<IPage<BaseServe>> no_queryServeForPage(BaseServe param,
+                                                             Integer pageNum,
+                                                             Integer pageSize,
+                                                             Integer labelId,
+                                                             String serveIds,
+                                                             String time) {
+        if (labelId != null && labelId == -1) {
+            labelId = null;
+        }
+        List<Integer> serveIdList;
+        if (StringUtils.isNotEmpty(serveIds)) {
+            serveIdList = Lists.newArrayList(serveIds.split(",")).stream().map(Integer::valueOf).collect(Collectors.toList());
+        } else {
+            serveIdList = new ArrayList<>();
+        }
+        if (pageNum == null) {
+            pageNum = 1;
+        }
+        if (pageSize == null) {
+            pageSize = 20;
+        }
+        IPage<BaseServe> page = new Page<>(pageNum, pageSize);
+        int weekday = DateUtils.getWeek(new Date());
+
+        param.setServeLabelId(labelId);
+
+        if (StringUtils.isEmpty(time))
+            page = baseServeService.listServeForPage(page, param, serveIdList);
+        else
+            page = baseServeMapper.listLeisureServeForPage(page, param, serveIdList, time, weekday);
+
+        return JsonResult.success(page);
+    }
+
 
     @ApiOperation(value = "查看服务详情")
     @GetMapping("/customer/serve/getServeDetail")