From c017a38ce24bfae8e9d1729210da8511ba85d29e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 18:03:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 c531526..606861f 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
@@ -8,12 +8,16 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.feignClient.UserCouponClient;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.UserCoupon;
import com.ruoyi.common.core.domain.R;
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 io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -21,6 +25,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 +50,8 @@
private AppUserClient appUserClient;
@Resource
private UserCouponClient userCouponClient;
+ @Resource
+ private GoodsService goodsService;
@GetMapping("/list")
@ApiOperation(value = "优惠劵管理-列表", tags = {"管理后台-活动管理"})
@@ -65,6 +72,18 @@
@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);
+ }
+ String personIds = byId.getPersonIds();
+ if (StringUtils.isNotEmpty(personIds)){
+ List<AppUser> appUserList = appUserClient.listByIds(Arrays.asList(personIds.split(",")));
+ byId.setAppUserList(appUserList);
+ }
+
return R.ok(byId);
}
@@ -81,7 +100,7 @@
@ApiOperation(value = "优惠劵管理-编辑", tags = {"管理后台-活动管理"})
public R<Void> edit(@RequestBody CouponInfo couponInfo) {
List<String> goodsNameList = couponInfo.getGoodsNameList();
- couponInfo.setGoodsNames(JSON.toJSONString(goodsNameList));
+ couponInfo.setGoodsNameJson(JSON.toJSONString(goodsNameList));
couponInfoService.updateById(couponInfo);
return R.ok();
}
@@ -104,7 +123,7 @@
public R<Void> add(@RequestBody CouponInfo couponInfo) {
couponInfo.setShelfStatus(0);
List<String> goodsNameList = couponInfo.getGoodsNameList();
- couponInfo.setGoodsNames(JSON.toJSONString(goodsNameList));
+ couponInfo.setGoodsNameJson(JSON.toJSONString(goodsNameList));
couponInfoService.save(couponInfo);
return R.ok();
}
@@ -158,5 +177,15 @@
return R.ok(couponInfos);
}
+
+ /**
+ * 获取领取记录
+ */
+
+ @GetMapping("/getReceiveRecord")
+ public R<IPage<UserCoupon>> getReceiveRecord(@ApiParam("页码") @RequestParam Integer pageNum, @ApiParam("大小") Integer pageSize,UserCoupon userCoupon) {
+ return null;
+ }
+
}
--
Gitblit v1.7.1