From 1f09f6daaf73bc83cceb4ae22b862b7b365635cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 四月 2025 19:59:17 +0800
Subject: [PATCH] 修改反馈文档bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java | 131 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 119 insertions(+), 12 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 6e5189d..d154540 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,18 +1,24 @@
package com.ruoyi.other.controller;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.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;
@@ -20,10 +26,14 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.Collection;
import java.util.List;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.stream.Collectors;
/**
* <p>
@@ -44,12 +54,18 @@
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) {
+ Integer periodType = couponInfo.getPeriodType();
+ if (periodType != null && periodType.equals(0)){
+ couponInfo.setPeriodType(null);
+ }
IPage<CouponInfo> couponInfoIPage = couponInfoService.queryCouponInfoPage(Page.of(pageNum, pageSize), couponInfo);
for (CouponInfo record : couponInfoIPage.getRecords()) {
R<Long> r = userCouponClient.getCouponCount(record.getId());
@@ -60,10 +76,26 @@
//查看详情
- @PostMapping("/detail")
+ @GetMapping("/detail")
@ApiOperation(value = "优惠劵管理-详情", tags = {"管理后台-活动管理"})
public R<CouponInfo> detail(@RequestParam("id") Integer id) {
CouponInfo byId = couponInfoService.getById(id);
+ if (byId == null){
+ return R.fail("优惠劵不存在");
+ }
+ String forGoodIds = byId.getForGoodIds();
+ if (!"-1".equals(forGoodIds) && StringUtils.isNotEmpty(forGoodIds)){
+ List<Goods> goods = goodsService.listByIds(Arrays.asList(forGoodIds.split(",")));
+ byId.setGoods(goods);
+ byId.setGoodsNameList(goods.stream().map(Goods::getName).collect(Collectors.toList()));
+ }
+ String personIds = byId.getPersonIds();
+ if (StringUtils.isNotEmpty(personIds)){
+ List<Long> ids = Arrays.stream(personIds.split(",")).map(Long::valueOf).collect(Collectors.toList());
+ List<AppUser> appUserList = appUserClient.listByIds(ids);
+ byId.setAppUserList(appUserList);
+ }
+
return R.ok(byId);
}
@@ -79,6 +111,13 @@
@PostMapping("/edit")
@ApiOperation(value = "优惠劵管理-编辑", tags = {"管理后台-活动管理"})
public R<Void> edit(@RequestBody CouponInfo couponInfo) {
+ List<String> goodsNameList = couponInfo.getGoodsNameList();
+ couponInfo.setGoodsNameJson(JSON.toJSONString(goodsNameList));
+ if(couponInfo.getPeriodType() == 2){
+ Integer periodDays = couponInfo.getPeriodDays();
+ couponInfo.setPeriodStartTime(LocalDate.now());
+ couponInfo.setPeriodEndTime(LocalDate.now().plusDays(periodDays));
+ }
couponInfoService.updateById(couponInfo);
return R.ok();
}
@@ -100,6 +139,14 @@
@ApiOperation(value = "优惠劵管理-添加", tags = {"管理后台-活动管理"})
public R<Void> add(@RequestBody CouponInfo couponInfo) {
couponInfo.setShelfStatus(0);
+ List<String> goodsNameList = couponInfo.getGoodsNameList();
+ couponInfo.setGoodsNameJson(JSON.toJSONString(goodsNameList));
+ couponInfo.setShelfStatus(1);
+ if(couponInfo.getPeriodType() == 2){
+ Integer periodDays = couponInfo.getPeriodDays();
+ couponInfo.setPeriodStartTime(LocalDate.now());
+ couponInfo.setPeriodEndTime(LocalDate.now().plusDays(periodDays));
+ }
couponInfoService.save(couponInfo);
return R.ok();
}
@@ -115,25 +162,63 @@
AppUser appUserById = appUserClient.getAppUserById(userid);
LocalDateTime now = LocalDateTime.now();
//查出全部可领取的优惠劵
- List<CouponInfo> list = couponInfoService.lambdaQuery().le(CouponInfo::getSendStartTime, now).ge(CouponInfo::getSendEndTime, now).eq(CouponInfo::getPersonType, 1).list();
+ List<CouponInfo> list = couponInfoService.lambdaQuery()
+ .le(CouponInfo::getSendStartTime, now)
+ .ge(CouponInfo::getSendEndTime, now)
+ .eq(CouponInfo::getPersonType, 1)
+ .eq(CouponInfo::getDelFlag, 0)
+ .eq(CouponInfo::getShelfStatus, 1)
+ .list();
//查出指定人员可领取优惠券
- List<CouponInfo> list1 = couponInfoService.lambdaQuery().le(CouponInfo::getSendStartTime, now).ge(CouponInfo::getSendEndTime, now).eq(CouponInfo::getPersonType, 2).apply("FIND_IN_SET('" + appUserById.getId() + "', person_ids)").list();
+ List<CouponInfo> list1 = couponInfoService.lambdaQuery()
+ .le(CouponInfo::getSendStartTime, now)
+ .ge(CouponInfo::getSendEndTime, now)
+ .eq(CouponInfo::getPersonType, 2)
+ .eq(CouponInfo::getDelFlag, 0)
+ .eq(CouponInfo::getShelfStatus, 1)
+ .apply("FIND_IN_SET('" + appUserById.getId() + "', person_ids)")
+ .list();
//查出指定会员可领取优惠劵
- List<CouponInfo> list2 = couponInfoService.lambdaQuery().le(CouponInfo::getSendStartTime, now).ge(CouponInfo::getSendEndTime, now).eq(CouponInfo::getPersonType, 3).apply("FIND_IN_SET('" + appUserById.getVipId() + "', person_ids)").list();
+ List<CouponInfo> list2 = couponInfoService.lambdaQuery()
+ .le(CouponInfo::getSendStartTime, now)
+ .ge(CouponInfo::getSendEndTime, now)
+ .eq(CouponInfo::getPersonType, 3)
+ .eq(CouponInfo::getDelFlag, 0)
+ .eq(CouponInfo::getShelfStatus, 1)
+ .apply("FIND_IN_SET('" + appUserById.getVipId() + "', vip_ids)").list();
List<CouponInfo> returnList = new ArrayList<>();
- count(userid, list, returnList);
- count(userid, list1, returnList);
- count(userid, list2, returnList);
+ returnList.addAll(list);
+ returnList.addAll(list1);
+ returnList.addAll(list2);
+ List<CouponInfo> collect = returnList.stream().filter(couponInfo -> {
+ Integer couponInfoId = couponInfo.getId();
+ Integer sendNum = couponInfo.getSendNum();
+ Integer maxNum = couponInfo.getMaxNum();
+ Long count = appUserClient.getCouponCount(-1L, couponInfoId).getData();
+ Long count2 = appUserClient.getCouponCount(userid, couponInfoId).getData();
+ return count < sendNum && count2 < maxNum;
+ }).collect(Collectors.toList());
- return R.ok(returnList);
+ return R.ok(collect);
}
private void count(Long userid, List<CouponInfo> list1, List<CouponInfo> returnList) {
for (CouponInfo couponInfo : list1) {
- Long count = appUserClient.getCouponCount(userid, couponInfo.getId()).getData();
- couponInfo.setMaxNum(couponInfo.getMaxNum() - count.intValue());
- for (int i = 0; i < couponInfo.getMaxNum(); i++) {
+ Integer couponInfoId = couponInfo.getId();
+ Integer sendNum = couponInfo.getSendNum();
+ Integer maxNum = couponInfo.getMaxNum();
+ Long count = appUserClient.getCouponCount(-1L, couponInfoId).getData();
+ if(count >= sendNum){
+ continue;
+ }
+
+ count = appUserClient.getCouponCount(userid, couponInfoId).getData();
+ couponInfo.setMaxNum(maxNum - count.intValue());
+ if(count < maxNum){
+ continue;
+ }
+ for (int i = 0; i < maxNum; i++) {
returnList.add(couponInfo);
}
}
@@ -153,5 +238,27 @@
return R.ok(couponInfos);
}
+
+ /**
+ * 获取领取记录
+ */
+
+ @GetMapping("/getReceiveRecord")
+ public R<IPage<UserCoupon>> getReceiveRecord(@ApiParam("页码") @RequestParam Integer pageNum, @ApiParam("大小") Integer pageSize,UserCoupon userCoupon) {
+ // TODO 待完善
+ return null;
+ }
+
+
+ /**
+ * 根据类型获取有效优惠券列表
+ */
+ @PostMapping("/getCouponInfoByPersonType")
+ public R<List<CouponInfo>> getCouponInfoByPersonType(@RequestParam("personType") Integer personType){
+ List<CouponInfo> list = couponInfoService.list(new LambdaUpdateWrapper<CouponInfo>().eq(CouponInfo::getPersonType, personType).eq(CouponInfo::getDelFlag, 0).eq(CouponInfo::getShelfStatus, 1).last(" and now() between period_start_time and period_end_time"));
+ return R.ok(list);
+ }
+
+
}
--
Gitblit v1.7.1