From dd1a88b70481f6fd6d9217608f02518bfca133d6 Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Mon, 14 Apr 2025 09:58:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OrderDetailController.java     | 21 ++-----------------
 .../order/controller/OrderInfoController.java | 21 ++-----------------
 .../OrderShoppingCartController.java          | 21 ++-----------------
 3 files changed, 6 insertions(+), 57 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderDetailController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderDetailController.java
index 4a53dae..7dd72a1 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderDetailController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderDetailController.java
@@ -29,17 +29,9 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/system/detail")
 public class OrderDetailController extends BaseController
 {
-    private String prefix = "system/detail";
-
     @Autowired
     private IOrderDetailService orderDetailService;
 
-    @GetMapping()
-    public String detail()
-    {
-        return prefix + "/detail";
-    }
-
     /**
      * 查询订单详情列表
      */
@@ -65,15 +57,6 @@ public class OrderDetailController extends BaseController
         util.exportExcel(response, list, "订单详情数据");
     }
 
-    /**
-     * 新增订单详情
-     */
-    @GetMapping("/add")
-    public String add()
-    {
-        return prefix + "/add";
-    }
-
     /**
      * 新增保存订单详情
      */
@@ -89,11 +72,11 @@ public class OrderDetailController extends BaseController
      * 修改订单详情
      */
     @GetMapping("/edit/{detailId}")
-    public String edit(@PathVariable("detailId") Long detailId, ModelMap mmap)
+    public OrderDetail edit(@PathVariable("detailId") Long detailId, ModelMap mmap)
     {
         OrderDetail orderDetail = orderDetailService.selectOrderDetailByDetailId(detailId);
         mmap.put("orderDetail", orderDetail);
-        return prefix + "/edit";
+        return orderDetail;
     }
 
     /**
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java
index 735280a..726687a 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java
@@ -29,17 +29,9 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/system/info")
 public class OrderInfoController extends BaseController
 {
-    private String prefix = "system/info";
-
     @Autowired
     private IOrderInfoService orderInfoService;
 
-    @GetMapping()
-    public String info()
-    {
-        return prefix + "/info";
-    }
-
     /**
      * 查询订单列表
      */
@@ -65,15 +57,6 @@ public class OrderInfoController extends BaseController
         util.exportExcel(response, list, "订单数据");
     }
 
-    /**
-     * 新增订单
-     */
-    @GetMapping("/add")
-    public String add()
-    {
-        return prefix + "/add";
-    }
-
     /**
      * 新增保存订单
      */
@@ -89,11 +72,11 @@ public class OrderInfoController extends BaseController
      * 修改订单
      */
     @GetMapping("/edit/{orderId}")
-    public String edit(@PathVariable("orderId") Long orderId, ModelMap mmap)
+    public OrderInfo edit(@PathVariable("orderId") Long orderId, ModelMap mmap)
     {
         OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderId);
         mmap.put("orderInfo", orderInfo);
-        return prefix + "/edit";
+        return orderInfo;
     }
 
     /**
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderShoppingCartController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderShoppingCartController.java
index 93db536..188da34 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderShoppingCartController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderShoppingCartController.java
@@ -29,17 +29,9 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/system/cart")
 public class OrderShoppingCartController extends BaseController
 {
-    private String prefix = "system/cart";
-
     @Autowired
     private IOrderShoppingCartService orderShoppingCartService;
 
-    @GetMapping()
-    public String cart()
-    {
-        return prefix + "/cart";
-    }
-
     /**
      * 查询订单购物车列表
      */
@@ -65,15 +57,6 @@ public class OrderShoppingCartController extends BaseController
         util.exportExcel(response, list, "订单购物车数据");
     }
 
-    /**
-     * 新增订单购物车
-     */
-    @GetMapping("/add")
-    public String add()
-    {
-        return prefix + "/add";
-    }
-
     /**
      * 新增保存订单购物车
      */
@@ -89,11 +72,11 @@ public class OrderShoppingCartController extends BaseController
      * 修改订单购物车
      */
     @GetMapping("/edit/{shoppingCartId}")
-    public String edit(@PathVariable("shoppingCartId") Long shoppingCartId, ModelMap mmap)
+    public OrderShoppingCart edit(@PathVariable("shoppingCartId") Long shoppingCartId, ModelMap mmap)
     {
         OrderShoppingCart orderShoppingCart = orderShoppingCartService.selectOrderShoppingCartByShoppingCartId(shoppingCartId);
         mmap.put("orderShoppingCart", orderShoppingCart);
-        return prefix + "/edit";
+        return orderShoppingCart;
     }
 
     /**