From 6ccd0f9e28c083e5f62d7d5074a85584a77af6bb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 17:09:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java |   69 +++++++++++++++++++++++++++++-----
 1 files changed, 59 insertions(+), 10 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 7ec762c..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
@@ -3,11 +3,13 @@
 
 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;
@@ -16,6 +18,7 @@
 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;
@@ -23,11 +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>
@@ -70,15 +76,16 @@
     @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)){
+        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<AppUser> appUserList = appUserClient.listByIds(Arrays.asList(personIds.split(",")));
+            List<Long> ids = Arrays.stream(personIds.split(",")).map(Long::valueOf).collect(Collectors.toList());
+            List<AppUser> appUserList = appUserClient.listByIds(ids);
             byId.setAppUserList(appUserList);
         }
 
@@ -99,6 +106,11 @@
     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();
     }
@@ -122,6 +134,12 @@
         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();
     }
@@ -141,23 +159,32 @@
         //查出指定人员可领取优惠券
         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> 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);
+                }
+            }
+            
         }
     }
 
@@ -175,5 +202,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