From c00d0d3bc399b6648145dfd955cedbea90f5f99d Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 18 六月 2023 17:38:22 +0800
Subject: [PATCH] 看板
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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..301a87f 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,16 @@
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 com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
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 +23,39 @@
@RequestMapping("/order")
public class OrderController {
- @Autowired
+ @Resource
private OrderService orderService;
- @InnerAuth
+
@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);
+ }
+
+
+ /**
+ * @description boardOrderTotal
+ * @param
+ * @return R<MgtBulletinBoardVo>
+ * @author jqs34
+ * @date 2023/6/18 17:30
+ */
+ @PostMapping("/boardOrderTotal")
+ public R<MgtBulletinBoardVo> boardOrderTotal(){
+ MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
+ MgtBulletinBoardVo mgtBulletinBoardVoOrder = orderService.boardOrderTotal();
+ mgtBulletinBoardVo.setSalesTotal(mgtBulletinBoardVoOrder.getSalesTotal());
+ mgtBulletinBoardVo.setUnUseOrderTotal(mgtBulletinBoardVo.getUnUseOrderTotal());
+ mgtBulletinBoardVo.setActivityOrderTotal(mgtBulletinBoardVo.getActivityOrderTotal());
+ return R.ok(mgtBulletinBoardVo);
+ }
+
}
--
Gitblit v1.7.1