From ec7528bb6cc65d3bce1c33d59e48ea5bc81c7782 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 14:27:43 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java | 201 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 164 insertions(+), 37 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 6c9c0cd..5f6df24 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,34 +1,43 @@
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.Banner;
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;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.other.api.domain.CouponInfo;
-import com.ruoyi.other.service.CouponInfoService;
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 javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
-import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
- * 前端控制器
+ * 前端控制器
* </p>
*
* @author luodangjia
@@ -43,18 +52,105 @@
private TokenService tokenService;
@Resource
private AppUserClient appUserClient;
- //查看详情
- @PostMapping("/detail")
- @ApiOperation(value = "详情", tags = {"后台-优惠劵"})
- public R<CouponInfo> detail(@RequestParam("id") Integer id){
- CouponInfo byId = couponInfoService.getById(id);
- return R.ok(byId);
+ @Resource
+ private UserCouponClient userCouponClient;
+ @Resource
+ private GoodsService goodsService;
+
+ @GetMapping("/list")
+ @ApiOperation(value = "优惠劵管理-列表", tags = {"管理后台-活动管理"})
+ public R<IPage<CouponInfo>> list(@RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize,
+ CouponInfo 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("/gift/list")
+ //查看详情
+ @GetMapping("/detail")
+ @ApiOperation(value = "优惠劵管理-详情", tags = {"管理后台-活动管理"})
+ public R<CouponInfo> detail(@RequestParam("id") Integer id) {
+ CouponInfo byId = couponInfoService.getById(id);
+ 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);
+ }
+
+ // 删除优惠劵
+ @DeleteMapping("/delete")
+ @ApiOperation(value = "优惠劵管理-删除", tags = {"管理后台-活动管理"})
+ public R<Void> delete(@RequestParam("id") Integer id) {
+ couponInfoService.removeById(id);
+ return R.ok();
+ }
+
+ // 编辑优惠劵
+ @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();
+ }
+
+ // 修改上/下架状态
+ @PostMapping("/editStatus")
+ @ApiOperation(value = "优惠劵管理-修改上/下架状态", tags = {"管理后台-活动管理"})
+ public R<Void> editStatus(@RequestParam("id") Integer id,
+ @RequestParam("shelfStatus") Integer shelfStatus) {
+ CouponInfo couponInfo = new CouponInfo();
+ couponInfo.setId(id);
+ couponInfo.setShelfStatus(shelfStatus);
+ couponInfoService.updateById(couponInfo);
+ 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));
+ 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();
+ }
+
+
+
+
+
+ @GetMapping("/gift/list")
@ApiOperation(value = "待领取列表", tags = {"小程序-个人中心-优惠劵"})
- public R<List<CouponInfo>> giftlist(){
+ public R<List<CouponInfo>> giftlist() {
Long userid = tokenService.getLoginUserApplet().getUserid();
AppUser appUserById = appUserClient.getAppUserById(userid);
LocalDateTime now = LocalDateTime.now();
@@ -63,39 +159,70 @@
//查出指定人员可领取优惠券
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> 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> returnList= new ArrayList<>();
+ List<CouponInfo> list2 = couponInfoService.lambdaQuery().le(CouponInfo::getSendStartTime, now).ge(CouponInfo::getSendEndTime, now).eq(CouponInfo::getPersonType, 3).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);
-
-
return R.ok(returnList);
}
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++) {
- returnList.add(couponInfo);
+ Long count = appUserClient.getCouponCount(-1L, couponInfo.getId()).getData();
+ if(count >= couponInfo.getSendNum()){
+ continue;
}
+ count = appUserClient.getCouponCount(userid, couponInfo.getId()).getData();
+ couponInfo.setMaxNum(couponInfo.getMaxNum() - count.intValue());
+ if((couponInfo.getSendNum() - count) >= couponInfo.getMaxNum()){
+ for (int i = 0; i < couponInfo.getMaxNum(); i++) {
+ returnList.add(couponInfo);
+ }
+ }else{
+ for (int i = 0; i < (couponInfo.getSendNum() - count); i++) {
+ returnList.add(couponInfo);
+ }
+ }
+
}
}
-
-
- /**
- * 根据id获取优惠券数据
- * @param ids
- * @return
- */
- @ResponseBody
- @PostMapping("/getCouponInfoList")
- public R<List<CouponInfo>> getCouponInfoList(@RequestParam("ids") List<Integer> ids){
- List<CouponInfo> couponInfos = couponInfoService.listByIds(ids);
- return R.ok(couponInfos);
- }
-
+
+ /**
+ * 根据id获取优惠券数据
+ *
+ * @param ids
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getCouponInfoList")
+ public R<List<CouponInfo>> getCouponInfoList(@RequestParam("ids") List<Integer> ids) {
+ List<CouponInfo> couponInfos = couponInfoService.listByIds(ids);
+ 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