From 1772afb069b75871572c9c438bbd2bc403f864df Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 13 十二月 2023 11:43:51 +0800 Subject: [PATCH] 修改bug --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 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 c22ac62..3f48f4b 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 @@ -5,10 +5,7 @@ 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.domain.vo.*; import com.ruoyi.system.api.factory.RemoteOrderFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -76,4 +73,48 @@ */ @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