From 9c6fd541f0aa8e384c26998597a6788bb77eca8d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 04 七月 2023 14:56:25 +0800
Subject: [PATCH] 商户端营销统计
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 d3e8a21..276fb0a 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
@@ -53,7 +53,7 @@
merVerifyCodeVo.setMerVerifyOrderVo(merVerifyOrderVo);
break;
case 2:
- MerVerifyCouponVo merVerifyCouponVo = null;
+ MerVerifyCouponVo merVerifyCouponVo = orderService.verifyCoupon(verifyCode);
merVerifyCodeVo.setMerVerifyCouponVo(merVerifyCouponVo);
break;
case 3:
@@ -73,6 +73,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);
}
@@ -110,13 +119,11 @@
@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));
}
--
Gitblit v1.7.1