From 9814a8fa6387ac048423e489597f2d56ece54fd6 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 14:50:21 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
index faef977..25ac661 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
@@ -12,7 +12,9 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.CouponInfo;
+import com.ruoyi.other.api.domain.Goods;
import com.ruoyi.other.service.CouponInfoService;
+import com.ruoyi.other.service.GoodsService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,6 +23,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Arrays;
import java.util.List;
import java.time.LocalDateTime;
@@ -45,6 +48,8 @@
private AppUserClient appUserClient;
@Resource
private UserCouponClient userCouponClient;
+ @Resource
+ private GoodsService goodsService;
@GetMapping("/list")
@ApiOperation(value = "优惠劵管理-列表", tags = {"管理后台-活动管理"})
@@ -65,6 +70,13 @@
@ApiOperation(value = "优惠劵管理-详情", tags = {"管理后台-活动管理"})
public R<CouponInfo> detail(@RequestParam("id") Integer id) {
CouponInfo byId = couponInfoService.getById(id);
+ byId.setGoodsNameList(JSON.parseArray(byId.getGoodsNameJson(), String.class));
+ String forGoodIds = byId.getForGoodIds();
+ if (StringUtils.isNotEmpty(forGoodIds)){
+ List<Goods> goods = goodsService.listByIds(Arrays.asList(forGoodIds.split(",")));
+ byId.setGoods(goods);
+ }
+
return R.ok(byId);
}
--
Gitblit v1.7.1