From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 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 b66f854..3f48f4b 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
@@ -87,4 +87,34 @@
      */
     @PostMapping("/order/getShopServiceTotal")
     public R<MerHomeShopTotalVo> getShopServiceTotal(@RequestBody Long shopId);
+
+    /**
+     * @description  获取区域统计
+     * @author  jqs
+     * @date    2023/8/25 11:52
+     * @param shopIdList
+     * @return  R<AgencyTotalVo>
+     */
+    @PostMapping("/order/getAgencyTotalVo")
+    public R<AgencyTotalVo> getAgencyTotalVo(@RequestBody List<Long> shopIdList);
+
+
+    /**
+     * @description  获取用户统计
+     * @author  jqs
+     * @date    2023/8/29 17:38
+     * @param merBaseDto
+     * @return  R<MerMemberSimpleTotalVo>
+     */
+    @PostMapping("/order/getMerMemberSimpleTotalVo")
+    public R<MerMemberSimpleTotalVo> getMerMemberSimpleTotalVo(@RequestBody MerBaseDto merBaseDto);
+
+
+    /**
+     * 获取活动订单商品id
+     * @param activityId
+     * @return
+     */
+    @PostMapping("/order/getActivityOrderGoods")
+    R<List<String>> getActivityOrderGoods(@RequestBody String activityId);
 }

--
Gitblit v1.7.1