From 8aa9582001e46a9d621e1a6cdaafd52ee7500584 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 04 七月 2023 16:34:35 +0800
Subject: [PATCH] 商户端其他统计
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
index b8c7168..16f5118 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
@@ -8,6 +8,7 @@
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
@@ -36,7 +37,6 @@
private OrderService orderService;
-
@RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
@ApiOperation(value = "核销code")
public R<MerVerifyCodeVo> verifyCode(@RequestBody MerVerifyCodeDto merVerifyCodeDto) {
@@ -54,7 +54,7 @@
merVerifyCodeVo.setMerVerifyOrderVo(merVerifyOrderVo);
break;
case 2:
- MerVerifyCouponVo merVerifyCouponVo = null;
+ MerVerifyCouponVo merVerifyCouponVo = orderService.verifyCoupon(verifyCode);
merVerifyCodeVo.setMerVerifyCouponVo(merVerifyCouponVo);
break;
case 3:
@@ -74,6 +74,15 @@
merVerifyOrderDto.setUserId(userId);
MerVerifyOrderVo merVerifyOrderVo = orderService.sureVerifyOrder(merVerifyOrderDto);
return R.ok(merVerifyOrderVo);
+ }
+
+ @RequestMapping(value = "/sureVerifyCoupon", method = RequestMethod.POST)
+ @ApiOperation(value = "核销优惠券")
+ public R<MerVerifyCouponVo> sureVerifyCoupon(@RequestBody MerVerifyCouponDto merVerifyCouponDto) {
+ Long userId = SecurityUtils.getUserId();
+ merVerifyCouponDto.setUserId(userId);
+ MerVerifyCouponVo merVerifyCouponVo = orderService.sureVerifyCoupon(merVerifyCouponDto);
+ return R.ok(merVerifyCouponVo);
}
@@ -111,17 +120,24 @@
@RequestMapping(value = "/pageMerOrder", method = RequestMethod.POST)
@ApiOperation(value = "获取商户端订单列表")
public R<Page<MerOrderPageVo>> pageMerOrder(@RequestBody MerOrderPageDto merOrderPageDto) {
- log.info("merOrderPageDto1----"+merOrderPageDto.toString());
Long userId = SecurityUtils.getUserId();
merOrderPageDto.setUserId(userId);
Page<MerOrderPageVo> page = new Page<>();
page.setSize(merOrderPageDto.getPageSize());
page.setCurrent(merOrderPageDto.getPageNum());
- log.info("merOrderPageDto2----"+merOrderPageDto.toString());
List<MerOrderPageVo> merOrderPageVoList = orderService.pageMerOrder(page,merOrderPageDto);
return R.ok(page.setRecords(merOrderPageVoList));
}
+ @RequestMapping(value = "/totalMerOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "商户端订单管理统计")
+ public R<MerTotalOrderVo> totalMerOrder(@RequestBody MerBaseDto merBaseDto) {
+ Long userId = SecurityUtils.getUserId();
+ merBaseDto.setUserId(userId);
+ MerTotalOrderVo totalOrderVo = orderService.totalMerOrder(merBaseDto);
+ return R.ok(totalOrderVo);
+ }
+
@RequestMapping(value = "/pageMerMemberOrder", method = RequestMethod.POST)
@ApiOperation(value = "分页商户端用户收银记录")
public R<Page<MerMemberNoClearOrderVo>> pageMerMemberOrder(@RequestBody MerMemberNoClearOrderDto merMemberNoClearOrderDto) {
--
Gitblit v1.7.1