From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 5 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 f46ebec..bfa7ee7 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
@@ -2,12 +2,11 @@
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 org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -33,7 +32,7 @@
* @date 2023/6/18 17:29
*/
@PostMapping("/order/boardOrderTotal")
- public R<MgtBulletinBoardVo> boardOrderTotal();
+ public R<MgtBulletinBoardVo> boardOrderTotal(@RequestBody BoardMemberTotalDto boardMemberTotalDto);
/**
* @description
@@ -55,4 +54,68 @@
*/
@PostMapping("/order/getMemberUnpaidOrder")
public R<BigDecimal> getMemberUnpaidOrder(@RequestBody MerBaseDto merBaseDto);
+
+ /**
+ * @description 发送用户商品礼物
+ * @author jqs
+ * @date 2023/7/7 19:53
+ * @param giftSendDtoList
+ * @return R
+ */
+ @PostMapping("/order/sendGoodsGift")
+ public R sendGoodsGift(@RequestBody List<BirthdayGiftSendDto> giftSendDtoList);
+
+ /**
+ * @description 自动取消订单
+ * @author jqs
+ * @date 2023/7/13 17:15
+ * @param orderId
+ * @return R
+ */
+ @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);
}
--
Gitblit v1.7.1