From 037afe2b2fe08cfcc768e543fc15960e56e31b76 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 10 七月 2025 15:10:06 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 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 08929a3..25826b4 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
@@ -6,6 +6,7 @@
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
+import com.ruoyi.system.api.domain.dto.BoardMemberTotalDto;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.vo.*;
@@ -55,9 +56,9 @@
* @date 2023/6/18 17:30
*/
@PostMapping("/boardOrderTotal")
- public R<MgtBulletinBoardVo> boardOrderTotal(){
+ public R<MgtBulletinBoardVo> boardOrderTotal(@RequestBody BoardMemberTotalDto boardMemberTotalDto){
MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
- MgtBulletinBoardVo mgtBulletinBoardVoOrder = orderService.boardOrderTotal();
+ MgtBulletinBoardVo mgtBulletinBoardVoOrder = orderService.boardOrderTotal(boardMemberTotalDto.getUserIds());
mgtBulletinBoardVo.setSalesTotal(mgtBulletinBoardVoOrder.getSalesTotal());
mgtBulletinBoardVo.setUnUseOrderTotal(mgtBulletinBoardVoOrder.getUnUseOrderTotal());
mgtBulletinBoardVo.setActivityOrderTotal(mgtBulletinBoardVoOrder.getActivityOrderTotal());
@@ -175,4 +176,27 @@
ProfitSharingResult result = orderService.queryBill(orderId);
return R.ok(result);
}
+
+ /**
+ * 获取活动订单商品id
+ * @param activityId
+ * @return
+ */
+ @PostMapping("/getActivityOrderGoods")
+ public R<List<String>> getActivityOrderGoods(@RequestBody String activityId){
+ List<String> activityOrderGoods = orderService.getActivityOrderGoods(activityId);
+ return R.ok(activityOrderGoods);
+ }
+
+ /**
+ * 获取商品售卖统计
+ * @param goodsIdList
+ * @return
+ */
+ @PostMapping("/order/getGoodsSellStatic")
+ R<StaticsShopMgtGoodsVO> getGoodsSellStatic(@RequestBody List<String> goodsIdList){
+ StaticsShopMgtGoodsVO vo = orderService.getGoodsSellStatic(goodsIdList);
+ vo.setGoodsNum(goodsIdList.size());
+ return R.ok(vo);
+ }
}
--
Gitblit v1.7.1