From 579e969465105fcc007969c7e9b8c74f1b6434b2 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 09 六月 2023 18:12:29 +0800
Subject: [PATCH] 基础配置

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 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..ed5c34e 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
@@ -1,14 +1,10 @@
 package com.ruoyi.order.controller.concole;
 
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.annotation.InnerAuth;
 import com.ruoyi.order.service.order.OrderService;
-import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
 
 /**
  * @author jqs34
@@ -21,13 +17,20 @@
 @RequestMapping("/order")
 public class OrderController {
 
-    @Autowired
+    @Resource
     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