From beeda8df0023376dbb2021148a021731dc4aedb0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 11:29:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 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 5b6f2e4..c22ac62 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,13 +2,20 @@
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.MgtMapIntTotalVo;
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)
public interface RemoteOrderService {
@@ -28,4 +35,45 @@
*/
@PostMapping("/order/boardOrderTotal")
public R<MgtBulletinBoardVo> boardOrderTotal();
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/21 15:27
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapIntTotalVo>
+ */
+ @PostMapping("/order/listMemberGoodsRank")
+ 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);
}
--
Gitblit v1.7.1