From edbaff936b456973717aa37f0b00db2e6c5dfa84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 12 Jun 2024 22:18:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8C=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppMassagePackageController.java      | 34 +++++++++++++++++++
 .../AppMassagePackageDetailController.java    | 30 ++++++++++++++++
 .../app/AppUserPackageOrderController.java    |  3 +-
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/sqx/modules/bl/massage/app/AppMassagePackageController.java
 create mode 100644 src/main/java/com/sqx/modules/bl/massage/app/AppMassagePackageDetailController.java

diff --git a/src/main/java/com/sqx/modules/bl/massage/app/AppMassagePackageController.java b/src/main/java/com/sqx/modules/bl/massage/app/AppMassagePackageController.java
new file mode 100644
index 0000000..e5c117b
--- /dev/null
+++ b/src/main/java/com/sqx/modules/bl/massage/app/AppMassagePackageController.java
@@ -0,0 +1,34 @@
+package com.sqx.modules.bl.massage.app;
+
+import com.sqx.common.utils.Result;
+import com.sqx.modules.app.annotation.Login;
+import com.sqx.modules.bl.massage.entity.MassagePackage;
+import com.sqx.modules.bl.massage.service.MassagePackageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@RestController
+@RequestMapping("/app/massage/package")
+@Api(value = "服务包管理", tags = {"服务包管理"})
+public class AppMassagePackageController {
+
+    @Autowired
+    private MassagePackageService service;
+
+    @Login
+    @GetMapping("/findPage")
+    @ApiOperation("查询按服务包（分页）")
+    public Result findPage(MassagePackage massagePackage){
+        massagePackage.setStatus(1);
+        return service.findPage(massagePackage);
+    }
+
+}
diff --git a/src/main/java/com/sqx/modules/bl/massage/app/AppMassagePackageDetailController.java b/src/main/java/com/sqx/modules/bl/massage/app/AppMassagePackageDetailController.java
new file mode 100644
index 0000000..112fff1
--- /dev/null
+++ b/src/main/java/com/sqx/modules/bl/massage/app/AppMassagePackageDetailController.java
@@ -0,0 +1,30 @@
+package com.sqx.modules.bl.massage.app;
+
+import com.sqx.common.utils.Result;
+import com.sqx.modules.app.annotation.Login;
+import com.sqx.modules.bl.massage.entity.MassagePackageDetail;
+import com.sqx.modules.bl.massage.service.MassagePackageDetailService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/app/massage/packageDetail")
+@Api(value = "服务包详情管理", tags = {"服务包详情管理"})
+public class AppMassagePackageDetailController {
+
+    @Autowired
+    private MassagePackageDetailService service;
+
+    @Login
+    @GetMapping("/findPage")
+    @ApiOperation("查询按服务包详情（分页）")
+    public Result findPage(MassagePackageDetail massagePackageDetail){
+        massagePackageDetail.setStatus(1);
+        return service.findPage(massagePackageDetail);
+    }
+
+}
diff --git a/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageOrderController.java b/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageOrderController.java
index ec626ba..3406b4a 100644
--- a/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageOrderController.java
+++ b/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageOrderController.java
@@ -21,7 +21,7 @@ public class AppUserPackageOrderController {
     @Autowired
     private UserPackageOrderService service;
 
-//    @Login
+    @Login
     @PostMapping("/insertOrders")
     @ApiOperation("添加订单")
     public Result insertOrders(@RequestBody UserPackageOrder userPackageOrder){
@@ -29,6 +29,7 @@ public class AppUserPackageOrderController {
         return service.insertOrders(userPackageOrder);
     }
 
+    @Login
     @PostMapping("/payOrder")
     @ApiOperation("钱包支付订单")
     public Result payOrder(Long ordersId){