From b879982d29cb2dbfe72482b46c8f6f2064d663a2 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 15:27:29 +0800
Subject: [PATCH] 支付调整
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
index ccc0ce9..205930b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
@@ -6,10 +6,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 org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -106,4 +103,56 @@
consumerGoodsService.sendGoodsGift(giftSendDtoList);
return R.ok();
}
+
+ /**
+ * @description 自动取消订单
+ * @author jqs
+ * @date 2023/7/13 17:15
+ * @param orderId
+ * @return R
+ */
+ @PostMapping("/autoCancelOrder")
+ public R autoCancelOrder(@RequestBody String orderId){
+ orderService.autoCancelOrder(orderId);
+ return R.ok();
+ }
+
+ /**
+ * @description 销量排行
+ * @author jqs
+ * @date 2023/8/24 18:24
+ * @param shopIdList
+ * @return R<List<MgtMapBigTotalVo>>
+ */
+ @PostMapping("/shopSalesRank")
+ public R<List<MgtMapBigTotalVo>> shopSalesRank(@RequestBody List<Long> shopIdList){
+ List<MgtMapBigTotalVo> mapIntTotalVoList= orderService.shopSalesRank(shopIdList);
+ return R.ok(mapIntTotalVoList);
+ }
+
+ /**
+ * @description 获取商户服务统计
+ * @author jqs
+ * @date 2023/8/24 18:29
+ * @param shopId
+ * @return R<MerHomeShopTotalVo>
+ */
+ @PostMapping("/getShopServiceTotal")
+ public R<MerHomeShopTotalVo> getShopServiceTotal(@RequestBody Long shopId){
+ MerHomeShopTotalVo homeShopTotalVo= orderService.getShopServiceTotal(shopId);
+ return R.ok(homeShopTotalVo);
+ }
+
+ /**
+ * @description 获取区域统计
+ * @author jqs
+ * @date 2023/8/25 11:52
+ * @param shopIdList
+ * @return R<AgencyTotalVo>
+ */
+ @PostMapping("/getAgencyTotalVo")
+ public R<AgencyTotalVo> getAgencyTotalVo(@RequestBody List<Long> shopIdList){
+ AgencyTotalVo agencyTotalVo= orderService.getAgencyTotalVo(shopIdList);
+ return R.ok(agencyTotalVo);
+ }
}
--
Gitblit v1.7.1