From e5b802d4c12f7fef03461acd2d777f2a66d2f85e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 11:00:27 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java | 82 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 insertions(+), 7 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 c22ac62..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,16 +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.AppOrderTotalVo;
-import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
-import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
-import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
+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;
@@ -34,7 +32,7 @@
* @date 2023/6/18 17:29
*/
@PostMapping("/order/boardOrderTotal")
- public R<MgtBulletinBoardVo> boardOrderTotal();
+ public R<MgtBulletinBoardVo> boardOrderTotal(@RequestBody BoardMemberTotalDto boardMemberTotalDto);
/**
* @description
@@ -76,4 +74,74 @@
*/
@PostMapping("/order/autoCancelOrder")
public R autoCancelOrder(@RequestBody String orderId);
+
+
+ @PostMapping("/order/shopSalesRank")
+ public R<List<MgtMapBigTotalVo>> shopSalesRank(@RequestBody List<Long> shopIdList);
+
+ /**
+ * @description 获取商户服务统计
+ * @author jqs
+ * @date 2023/8/24 18:29
+ * @param shopId
+ * @return R<MerHomeShopTotalVo>
+ */
+ @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);
+
+ /**
+ * 获取商品售卖统计
+ * @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