From cfd0118ef446a66f91999afc7b1e46ca607adf50 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 13 七月 2023 20:32:35 +0800
Subject: [PATCH] 定时任务 统计
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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 2c80808..f3a8f1d 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
@@ -1,7 +1,9 @@
package com.ruoyi.order.controller.concole;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderService;
+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;
@@ -31,6 +33,9 @@
@Resource
private OrderService orderService;
+ @Resource
+ private ConsumerGoodsService consumerGoodsService;
+
@PostMapping("/getAppOrderTotal")
public R<AppOrderTotalVo> getAppOrderTotal(@RequestBody Long userId){
@@ -58,8 +63,8 @@
MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
MgtBulletinBoardVo mgtBulletinBoardVoOrder = orderService.boardOrderTotal();
mgtBulletinBoardVo.setSalesTotal(mgtBulletinBoardVoOrder.getSalesTotal());
- mgtBulletinBoardVo.setUnUseOrderTotal(mgtBulletinBoardVo.getUnUseOrderTotal());
- mgtBulletinBoardVo.setActivityOrderTotal(mgtBulletinBoardVo.getActivityOrderTotal());
+ mgtBulletinBoardVo.setUnUseOrderTotal(mgtBulletinBoardVoOrder.getUnUseOrderTotal());
+ mgtBulletinBoardVo.setActivityOrderTotal(mgtBulletinBoardVoOrder.getActivityOrderTotal());
return R.ok(mgtBulletinBoardVo);
}
@@ -89,4 +94,29 @@
return R.ok(unpaidMoney);
}
+ /**
+ * @description 发送用户商品礼物
+ * @author jqs
+ * @date 2023/7/7 19:53
+ * @param giftSendDtoList
+ * @return R
+ */
+ @PostMapping("/sendGoodsGift")
+ public R sendGoodsGift(@RequestBody List<BirthdayGiftSendDto> giftSendDtoList){
+ 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();
+ }
}
--
Gitblit v1.7.1