From 58d3e3d9d6a129c687044eef0418def8ad6e7cad Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期日, 27 八月 2023 19:10:27 +0800 Subject: [PATCH] bug --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 46 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 f46ebec..1d4a1c1 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,12 +2,10 @@ 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.domain.vo.*; import com.ruoyi.system.api.factory.RemoteOrderFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -55,4 +53,48 @@ */ @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); } -- Gitblit v1.7.1