From 5627daeb1ac1a29947e902f9a7efb6730ed98611 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 07 七月 2023 20:35:50 +0800
Subject: [PATCH] 管理台bug和用户端生日卡

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 47 insertions(+), 2 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 ced277b..d929ebc 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,14 +2,20 @@
 
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.poji.shop.Shop;
+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 com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
 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 {
@@ -20,5 +26,44 @@
     @PostMapping("/order/getMerHomeTotal")
     public R<MerHomeShopTotalVo> getMerHomeTotal(@RequestBody MerHomeShopTotalVo merHomeShopTotalVo);
 
+    /**
+     * @description boardOrderTotal
+     * @param
+     * @return R<MgtBulletinBoardVo>
+     * @author jqs34
+     * @date 2023/6/18 17:29
+     */
+    @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);
 }

--
Gitblit v1.7.1