From c9bdc58a6a9130f1c83962f114a9593a7af37014 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 28 七月 2025 19:05:08 +0800
Subject: [PATCH] bug修改
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java | 124 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 120 insertions(+), 4 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..d5ea5b1 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,19 @@
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.vo.AppOrderTotalVo;
-import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
+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.*;
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 org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.List;
@FeignClient(contextId = "remoteOrderService", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = RemoteOrderFallbackFactory.class)
public interface RemoteOrderService {
@@ -20,5 +25,116 @@
@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(@RequestBody BoardMemberTotalDto boardMemberTotalDto);
+
+ /**
+ * @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);
+
+
+ @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);
}
--
Gitblit v1.7.1