用户端代码提交

nightFragrance-massage/src/main/java/com/ylx/banner/controller/ClientBannerController.java

@@ -19,12 +19,12 @@ import javax.annotation.Resource;
 @RequestMapping("/client/banner")
 @Api(tags = {"客户端轮播图"})
 @Slf4j
+@PreAuthorize("@customerAuth.isCustomer()")
 public class ClientBannerController {
 
     @Resource
     private BannerService bannerService;
 
-    @PreAuthorize("@customerAuth.isCustomer()")
     @ApiOperation("客户端首页分页查询轮播图数据")
     @PostMapping("/page")
     public R<Page<BannerVO>> page(Page<Banner> page) {

nightFragrance-massage/src/main/java/com/ylx/order/controller/OrderController.java

@@ -21,12 +21,12 @@ import java.util.Map;
 @RequestMapping("/order")
 @Api(tags = {"订单模块"})
 @Slf4j
+@PreAuthorize("@customerAuth.isCustomer()")
 public class OrderController {
 
     @Resource
     private TOrderService orderService;
 
-    @PreAuthorize("@customerAuth.isCustomer()")
     @ApiOperation("客户端用户提交订单")
     @PostMapping("/submit")
     public R<Map<String, Object>> submitOrder(@Validated @RequestBody OrderSubmitDTO dto) {
@@ -34,7 +34,6 @@ public class OrderController {
         return R.ok(data);
     }
 
-    @PreAuthorize("@customerAuth.isCustomer()")
     @ApiOperation("根据日期范围等条件查询订单")
     @PostMapping("/queryByDate")
     public R<Page<OrderDateQueryVo>> queryOrderByDate(@Validated @RequestBody OrderDateQueryDTO dto) {
@@ -42,7 +41,6 @@ public class OrderController {
         return R.ok(page);
     }
 
-    @PreAuthorize("@customerAuth.isCustomer()")
     @ApiOperation("逻辑删除订单（移入回收站）")
     @PostMapping("/delete")
     public R<?> deleteOrder(@Validated @RequestBody OrderDeleteDTO dto) {
@@ -58,7 +56,6 @@ public class OrderController {
         return R.ok(orderService.getOrderDetailById(orderId));
     }
 
-    @PreAuthorize("@customerAuth.isCustomer()")
     @ApiOperation("用户取消订单")
     @PostMapping("/cancel")
     public R<?> cancelOrder(@RequestBody @Validated OrderCancleDTO dto) {
@@ -67,7 +64,6 @@ public class OrderController {
         return result > 0 ? R.ok("订单已取消") : R.fail("订单取消失败");
     }
 
-    @PreAuthorize("@customerAuth.isCustomer()")
     @ApiOperation("客户端是否可以预约当前时段")
     @PostMapping("/booking/check")
     public R<Boolean> bookingCheck(@RequestBody @Validated BookingCheckDTO dto) {

nightFragrance-massage/src/main/java/com/ylx/project/controller/ClientProjectController.java

@@ -0,0 +1,48 @@
+package com.ylx.project.controller;
+
+import com.ylx.common.core.domain.R;
+import com.ylx.project.domain.bookMerchant.dto.BookMerchantDTO;
+import com.ylx.project.domain.bookMerchant.vo.BookProjectDetailVO;
+import com.ylx.project.domain.vo.ProjectBaseVo;
+import com.ylx.project.domain.vo.ProjectDetailVo;
+import com.ylx.project.service.ProjectService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("/client/project")
+@Api(tags = {"客户端项目相关"})
+@Slf4j
+@PreAuthorize("@customerAuth.isCustomer()")
+public class ClientProjectController {
+
+    @Resource
+    private ProjectService projectService;
+
+    @ApiOperation("客户端根据服务标签获取服务项目集合数据")
+    @GetMapping("/categoryId/{categoryId}")
+    public R<List<ProjectBaseVo>> getProjectTabList(@PathVariable("categoryId") Integer categoryId) {
+        List<ProjectBaseVo> list = this.projectService.getProjectTabListByCategoryId(categoryId);
+        return R.ok(list);
+    }
+
+    @ApiOperation("客户端获取去预约项目详情")
+    @PostMapping("/bookDetail")
+    public R<BookProjectDetailVO> getBookingProjectDetail(@Validated @RequestBody BookMerchantDTO dto) {
+        BookProjectDetailVO vo = this.projectService.getBookingProjectDetail(dto);
+        return R.ok(vo);
+    }
+
+    @ApiOperation("客户端根据ID获取项目详情信息")
+    @GetMapping("/detail/{id}")
+    public R<ProjectDetailVo> getDetailById(@PathVariable("id") Long id) {
+        return R.ok(this.projectService.getDetailsInfo(id));
+    }
+}

nightFragrance-massage/src/main/java/com/ylx/project/controller/ProjectController.java

@@ -6,12 +6,9 @@ import com.ylx.common.core.domain.R;
 import com.ylx.common.enums.BusinessType;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.project.domain.Project;
-import com.ylx.project.domain.bookMerchant.dto.BookMerchantDTO;
-import com.ylx.project.domain.bookMerchant.vo.BookProjectDetailVO;
 import com.ylx.project.domain.dto.ProjectAddDTO;
 import com.ylx.project.domain.dto.ProjectSearchDTO;
 import com.ylx.project.domain.dto.ProjectUpdateDTO;
-import com.ylx.project.domain.vo.ProjectBaseVo;
 import com.ylx.project.domain.vo.ProjectDetailVo;
 import com.ylx.project.domain.vo.ProjectPageVo;
 import com.ylx.project.service.ProjectService;
@@ -23,7 +20,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @RestController
 @RequestMapping("/project")
@@ -132,20 +128,4 @@ public class ProjectController {
         }
     }
 
-    @PreAuthorize("@customerAuth.isCustomer()")
-    @ApiOperation("客户端根据服务标签获取服务项目集合数据")
-    @GetMapping("/categoryId/{categoryId}")
-    public R<List<ProjectBaseVo>> getProjectTabList(@PathVariable("categoryId") Integer categoryId) {
-        List<ProjectBaseVo> list = this.projectService.getProjectTabListByCategoryId(categoryId);
-        return R.ok(list);
-    }
-
-    @PreAuthorize("@customerAuth.isCustomer()")
-    @ApiOperation("客户端获取去预约项目详情")
-    @PostMapping("/bookDetail")
-    public R<BookProjectDetailVO> getBookingProjectDetail(@Validated @RequestBody BookMerchantDTO dto) {
-        BookProjectDetailVO vo = projectService.getBookingProjectDetail(dto);
-        return R.ok(vo);
-    }
-
 }

nightFragrance-massage/src/main/java/com/ylx/project/service/ProjectService.java

@@ -9,7 +9,6 @@ import com.ylx.massage.domain.vo.ProductOptionVO;
 import com.ylx.massage.domain.vo.ProductServiceOptionVO;
 import com.ylx.project.domain.Project;
 import com.ylx.project.domain.bookMerchant.dto.BookMerchantDTO;
-import com.ylx.project.domain.bookMerchant.vo.BookMerchantVO;
 import com.ylx.project.domain.bookMerchant.vo.BookProjectDetailVO;
 import com.ylx.project.domain.dto.ProjectAddDTO;
 import com.ylx.project.domain.dto.ProjectSearchDTO;

nightFragrance-massage/src/main/java/com/ylx/servicecategory/controller/ClientServiceCategoryController.java

@@ -19,12 +19,13 @@ import javax.annotation.Resource;
 @RestController
 @Api(tags = {"服务类目管理"})
 @RequestMapping("/client/service/category")
+@PreAuthorize("@customerAuth.isCustomer()")
+
 public class ClientServiceCategoryController {
 
     @Resource
     private ServiceCategoryService serviceCategoryService;
 
-    @PreAuthorize("@customerAuth.isCustomer()")
     @PostMapping("page")
     @ApiOperation("客户端首页分页查询服务类目数据")
     public R<Page<ClientServiceCategoryVO>> page(Page<ServiceCategory> page) {