From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 3359ae8..8f8a37c 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
@@ -52,6 +52,7 @@
break;
case 2:
MerVerifyCouponVo merVerifyCouponVo = orderService.verifyCoupon(verifyCode,merVerifyCodeDto.getShopId());
+ merVerifyCouponVo.setCouponId(merVerifyCouponVo.getMemberCouponId().toString());
merVerifyCodeVo.setMerVerifyCouponVo(merVerifyCouponVo);
break;
case 3:
@@ -75,7 +76,7 @@
}
@RequestMapping(value = "/sureVerifyOrder", method = RequestMethod.POST)
- @ApiOperation(value = "核销订单") //todo 分账
+ @ApiOperation(value = "核销订单")
public R<MerVerifyOrderVo> sureVerifyOrder(@RequestBody MerVerifyOrderDto merVerifyOrderDto) {
Long userId = SecurityUtils.getUserId();
merVerifyOrderDto.setUserId(userId);
--
Gitblit v1.7.1