From 7a74745bad7ff20df9e170433c1e1cb851ce7fa9 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 29 七月 2025 09:17:00 +0800
Subject: [PATCH] Merge branches '2.0' and '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java
index 9c6d0d0..fa287b2 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java
@@ -3,13 +3,14 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
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.*;
import com.ruoyi.system.api.factory.RemoteOrderFallbackFactory;
+import com.ruoyi.system.api.model.AddOrderVo;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.List;
@@ -31,7 +32,7 @@
* @date 2023/6/18 17:29
*/
@PostMapping("/order/boardOrderTotal")
- public R<MgtBulletinBoardVo> boardOrderTotal(@RequestBody List<Long> userIds);
+ public R<MgtBulletinBoardVo> boardOrderTotal(@RequestBody BoardMemberTotalDto boardMemberTotalDto);
/**
* @description
@@ -117,4 +118,30 @@
*/
@PostMapping("/order/getActivityOrderGoods")
R<List<String>> getActivityOrderGoods(@RequestBody String activityId);
+
+ /**
+ * 获取商品售卖统计
+ * @param orderIdList
+ * @return
+ */
+ @PostMapping("/order/getGoodsSellStatic")
+ R<StaticsShopMgtGoodsVO> getGoodsSellStatic(@RequestBody List<String> orderIdList);
+
+
+ /**
+ * 获取今日到店用户
+ * @param shopId
+ * @return
+ */
+ @PostMapping("/order/countShopServicePerson")
+ R<List<Integer>> countShopServicePerson(@RequestParam("shopId") Long shopId);
+
+ /**
+ * 抽奖活动添加订单
+ * @param orderVo
+ * @return
+ */
+ @PostMapping(value = "/order/addOrder")
+ R addOrder(@RequestBody AddOrderVo orderVo);
+
}
--
Gitblit v1.7.1