From decac42c276d690ca302f21655b5ea806a85a09f Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 15:05:38 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 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 25ff193..7ec762c 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
@@ -1,16 +1,20 @@
package com.ruoyi.other.controller;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.feignClient.UserCouponClient;
import com.ruoyi.account.api.model.AppUser;
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 org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,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;
@@ -41,26 +46,47 @@
private TokenService tokenService;
@Resource
private AppUserClient appUserClient;
+ @Resource
+ private UserCouponClient userCouponClient;
+ @Resource
+ private GoodsService goodsService;
- @PostMapping("/list")
+ @GetMapping("/list")
@ApiOperation(value = "优惠劵管理-列表", tags = {"管理后台-活动管理"})
public R<IPage<CouponInfo>> list(@RequestParam("pageNum") Integer pageNum,
@RequestParam("pageSize") Integer pageSize,
CouponInfo couponInfo) {
- return R.ok(couponInfoService.queryCouponInfoPage(Page.of(pageNum, pageSize), couponInfo));
+ IPage<CouponInfo> couponInfoIPage = couponInfoService.queryCouponInfoPage(Page.of(pageNum, pageSize), couponInfo);
+ for (CouponInfo record : couponInfoIPage.getRecords()) {
+ R<Long> r = userCouponClient.getCouponCount(record.getId());
+ record.setSendNumNow(r.getData());
+ }
+ return R.ok(couponInfoIPage);
}
//查看详情
- @PostMapping("/detail")
+ @GetMapping("/detail")
@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);
}
// 删除优惠劵
- @PostMapping("/delete")
+ @DeleteMapping("/delete")
@ApiOperation(value = "优惠劵管理-删除", tags = {"管理后台-活动管理"})
public R<Void> delete(@RequestParam("id") Integer id) {
couponInfoService.removeById(id);
@@ -71,6 +97,8 @@
@PostMapping("/edit")
@ApiOperation(value = "优惠劵管理-编辑", tags = {"管理后台-活动管理"})
public R<Void> edit(@RequestBody CouponInfo couponInfo) {
+ List<String> goodsNameList = couponInfo.getGoodsNameList();
+ couponInfo.setGoodsNameJson(JSON.toJSONString(goodsNameList));
couponInfoService.updateById(couponInfo);
return R.ok();
}
@@ -87,6 +115,17 @@
return R.ok();
}
+ // 添加优惠券
+ @PostMapping("/add")
+ @ApiOperation(value = "优惠劵管理-添加", tags = {"管理后台-活动管理"})
+ public R<Void> add(@RequestBody CouponInfo couponInfo) {
+ couponInfo.setShelfStatus(0);
+ List<String> goodsNameList = couponInfo.getGoodsNameList();
+ couponInfo.setGoodsNameJson(JSON.toJSONString(goodsNameList));
+ couponInfoService.save(couponInfo);
+ return R.ok();
+ }
+
--
Gitblit v1.7.1