From c203ff63489126a94d1be5dbfe32cadb69a70594 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 25 五月 2023 16:26:56 +0800
Subject: [PATCH] 完善数据库和框架

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
index 4822ac7..63eeb48 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
@@ -4,6 +4,7 @@
 import com.ruoyi.common.security.annotation.InnerAuth;
 import com.ruoyi.order.service.order.OrderService;
 import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,10 +25,17 @@
     @Autowired
     private OrderService orderService;
 
-    @InnerAuth
-    @PostMapping("/getAppOrderTotal")
+
+    /*@PostMapping("/getAppOrderTotal")
     public R<AppOrderTotalVo> getAppOrderTotal(@RequestBody Long userId){
         AppOrderTotalVo appOrderTotalVo = orderService.getAppOrderTotal(userId);
         return R.ok(appOrderTotalVo);
     }
+
+
+    @PostMapping("/getMerHomeTotal")
+    public R<MerHomeShopTotalVo> getMerHomeTotal(@RequestBody MerHomeShopTotalVo merHomeShopTotalVo){
+        merHomeShopTotalVo = orderService.getMerHomeTotal(merHomeShopTotalVo);
+        return R.ok(merHomeShopTotalVo);
+    }*/
 }

--
Gitblit v1.7.1