From 7c9dda6138ceea88a312583a3fcc9b2bb356fbc4 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 05 八月 2023 09:37:54 +0800
Subject: [PATCH] bug和二维码
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 c6c5202..01b334d 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,7 +8,6 @@
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;
@@ -58,7 +57,7 @@
merVerifyCodeVo.setMerVerifyCouponVo(merVerifyCouponVo);
break;
case 3:
- MerVerifyAwardVo merVerifyAwardVo = null;
+ MerVerifyAwardVo merVerifyAwardVo = orderService.verifyPrize(verifyCode,merVerifyCodeDto.getShopId());
merVerifyCodeVo.setMerVerifyAwardVo(merVerifyAwardVo);
break;
default:
@@ -83,6 +82,15 @@
merVerifyCouponDto.setUserId(userId);
MerVerifyCouponVo merVerifyCouponVo = orderService.sureVerifyCoupon(merVerifyCouponDto);
return R.ok(merVerifyCouponVo);
+ }
+
+ @RequestMapping(value = "/sureVerifyPrize", method = RequestMethod.POST)
+ @ApiOperation(value = "核销奖品")
+ public R<MerVerifyAwardVo> sureVerifyPrize(@RequestBody MerVerifyPrizeDto merVerifyPrizeDto) {
+ Long userId = SecurityUtils.getUserId();
+ merVerifyPrizeDto.setUserId(userId);
+ MerVerifyAwardVo merVerifyAwardVo = orderService.sureVerifyPrize(merVerifyPrizeDto);
+ return R.ok(merVerifyAwardVo);
}
@@ -131,10 +139,10 @@
@RequestMapping(value = "/totalMerOrder", method = RequestMethod.POST)
@ApiOperation(value = "商户端订单管理统计")
- public R<MerTotalOrderVo> totalMerOrder(@RequestBody MerBaseDto merBaseDto) {
+ public R<MerTotalOrderVo> totalMerOrder(@RequestBody MerOrderPageDto merOrderPageDto) {
Long userId = SecurityUtils.getUserId();
- merBaseDto.setUserId(userId);
- MerTotalOrderVo totalOrderVo = orderService.totalMerOrder(merBaseDto);
+ merOrderPageDto.setUserId(userId);
+ MerTotalOrderVo totalOrderVo = orderService.totalMerOrder(merOrderPageDto);
return R.ok(totalOrderVo);
}
--
Gitblit v1.7.1