From 7747b92bc49c1b9bd8d67d016c311b03d0e58494 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 12 九月 2025 15:03:58 +0800
Subject: [PATCH] 添加获取卡包领取信息
---
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 2 +-
framework/src/main/java/cn/lili/modules/lmk/service/impl/CouponVirtualServiceImpl.java | 11 ++++++++++-
framework/src/main/java/cn/lili/modules/lmk/service/CouponVirtualService.java | 2 ++
buyer-api/src/main/java/cn/lili/controller/lmk/CouponCardController.java | 8 ++++++--
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/CouponCardController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/CouponCardController.java
index 88bdaa0..9bf841c 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/CouponCardController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/CouponCardController.java
@@ -1,7 +1,6 @@
package cn.lili.controller.lmk;
import cn.lili.base.Result;
-import cn.lili.modules.lmk.domain.query.ActivityQuery;
import cn.lili.modules.lmk.service.CouponVirtualService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,7 +17,7 @@
@RestController
@RequestMapping("/buyer/lmk/coupon/card")
public class CouponCardController {
- private CouponVirtualService couponVirtualService;
+ private final CouponVirtualService couponVirtualService;
@PostMapping("/{cardId}")
@ApiOperation(value = "棰嗗彇璐墿鍗�", notes = "棰嗗彇璐墿鍗�")
@@ -30,4 +29,9 @@
public Result changShareStatus(@PathVariable String cardId){
return couponVirtualService.changShareStatus(cardId);
}
+ @PostMapping("/couponCardInfo/{cardId}")
+ @ApiOperation(value = "鑾峰彇棰嗗彇淇℃伅", notes = "鑾峰彇棰嗗彇淇℃伅")
+ public Result couponCardInfo(@PathVariable String cardId){
+ return couponVirtualService.couponCardInfo(cardId);
+ }
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/CouponVirtualService.java b/framework/src/main/java/cn/lili/modules/lmk/service/CouponVirtualService.java
index 573a12b..6ea9f08 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/CouponVirtualService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/CouponVirtualService.java
@@ -69,4 +69,6 @@
Result tackCardById( String cardId);
Result changShareStatus( String cardId);
+
+ Result couponCardInfo(String cardId);
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/CouponVirtualServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/CouponVirtualServiceImpl.java
index dc1a5f2..b9d97a4 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/CouponVirtualServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/CouponVirtualServiceImpl.java
@@ -209,7 +209,7 @@
if (!b) {
throw new RuntimeException("棰嗗彇澶辫触");
}
- return Result.ok("棰嗗彇鎴愬姛");
+ return Result.ok().data(cardInfo.getCouponId());
} finally {
assert lock != null;
if (lock.isHeldByCurrentThread()) {
@@ -225,4 +225,13 @@
this.updateById(couponVirtual);
return Result.ok();
}
+
+ @Override
+ public Result couponCardInfo(String cardId) {
+ CouponVirtual couponVirtual = this.getById(cardId);
+ if (couponVirtual == null) {
+ throw new ServiceException("褰撳墠璐墿鍗′笉瀛樺湪");
+ }
+ return Result.ok().data(couponVirtual);
+ }
}
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index 36c99c2..3f0e17f 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -854,7 +854,7 @@
private static CouponVirtual getCouponVirtual(OrderItem orderItem) {
CouponVirtual couponVirtual = new CouponVirtual();
- couponVirtual.setOrderId(orderItem.getSn());
+ couponVirtual.setOrderId(orderItem.getOrderSn());
couponVirtual.setCouponId(orderItem.getCouponId());
couponVirtual.setCouponName(orderItem.getCouponName());
couponVirtual.setGoodsId(orderItem.getGoodsId());
--
Gitblit v1.8.0