From dbff53150cdc807faa56c0d1a947d24b69f372b9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 31 八月 2023 18:43:20 +0800
Subject: [PATCH] bug
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java | 78 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 6 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 8fca6f3..d499fb1 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,16 +2,16 @@
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.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.MgtMapTotalVo;
+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;
import org.springframework.web.bind.annotation.RequestBody;
+import java.math.BigDecimal;
import java.util.List;
@FeignClient(contextId = "remoteOrderService", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = RemoteOrderFallbackFactory.class)
@@ -38,8 +38,74 @@
* @author jqs
* @date 2023/6/21 15:27
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
*/
@PostMapping("/order/listMemberGoodsRank")
- public R<List<MgtMapTotalVo>> listMemberGoodsRank(MgtBasePlatformDto mgtBasePlatformDto);
+ public R<List<MgtMapIntTotalVo>> listMemberGoodsRank(@RequestBody MgtBasePlatformDto mgtBasePlatformDto);
+
+
+ /**
+ * @description 获取用户未支付金额
+ * @author jqs
+ * @date 2023/6/29 18:00
+ * @param merBaseDto
+ * @return R<BigDecimal>
+ */
+ @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);
}
--
Gitblit v1.7.1