From f28142767f8823667499e6e94a76789f601f1654 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
index 37ec498..11a35a9 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
@@ -7,12 +7,14 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.other.api.domain.OrderActivityInfo;
import com.ruoyi.other.service.OrderActivityInfoService;
+import com.ruoyi.other.service.VipSettingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -33,6 +35,8 @@
@Resource
private OrderActivityInfoService orderActivityInfoService;
+ @Resource
+ private VipSettingService vipSettingService;
/**
@@ -52,8 +56,9 @@
* 添加活动
*/
@PostMapping("/save")
- @ApiOperation(value = "添加活动", tags = {"管理后台-活动管理-订单优惠活动"})
+ @ApiOperation(value = "订单优惠活动-添加活动", tags = {"管理后台-活动管理"})
public R<Void> saveActivityConfig(@RequestBody OrderActivityInfo orderActivityInfo){
+ orderActivityInfo.setIsShelf(0);
orderActivityInfoService.save(orderActivityInfo);
return R.ok();
}
@@ -61,8 +66,8 @@
/**
* 删除活动
*/
- @PostMapping("/delete")
- @ApiOperation(value = "删除活动", tags = {"管理后台-活动管理-订单优惠活动-"})
+ @DeleteMapping("/delete")
+ @ApiOperation(value = "订单优惠活动-删除活动", tags = {"管理后台-活动管理"})
public R<Void> deleteActivityConfig(@RequestParam("id") Long id){
orderActivityInfoService.removeById(id);
return R.ok();
@@ -72,8 +77,9 @@
* 修改活动
*/
@PostMapping("/update")
- @ApiOperation(value = "修改活动", tags = {"管理后台-活动管理-订单优惠活动-"})
+ @ApiOperation(value = "修改活动", tags = {"管理后台-活动管理"})
public R<Void> updateActivityConfig(@RequestBody OrderActivityInfo orderActivityInfo){
+ orderActivityInfo.setId(Long.valueOf(orderActivityInfo.getIdStr()));
orderActivityInfoService.updateById(orderActivityInfo);
return R.ok();
}
@@ -82,26 +88,55 @@
* 获取活动列表
*/
@GetMapping("/list")
- @ApiOperation(value = "获取活动列表", tags = {"管理后台-活动管理-订单优惠活动"})
+ @ApiOperation(value = "订单优惠活动-获取活动列表", tags = {"管理后台-活动管理"})
public R<Page<OrderActivityInfo>> list(@ApiParam("页码") @RequestParam Integer pageNum,
@ApiParam("每一页数据大小") Integer pageSize,
OrderActivityInfo orderActivityInfo){
- return R.ok(orderActivityInfoService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<OrderActivityInfo>()
+ Page<OrderActivityInfo> page = orderActivityInfoService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<OrderActivityInfo>()
.eq(orderActivityInfo.getId() != null, OrderActivityInfo::getId, orderActivityInfo.getId())
.eq(StringUtils.isNotEmpty(orderActivityInfo.getActivityName()), OrderActivityInfo::getActivityName, orderActivityInfo.getActivityName())
- .lt(orderActivityInfo.getStatus() == 0, OrderActivityInfo::getStartTime, orderActivityInfo.getStartTime())
- .ge(orderActivityInfo.getStatus() == 1, OrderActivityInfo::getEndTime, orderActivityInfo.getStartTime())
- .eq(orderActivityInfo.getIsShelf() != null, OrderActivityInfo::getIsShelf, orderActivityInfo.getIsShelf())));
+ .lt(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 0, OrderActivityInfo::getStartTime, orderActivityInfo.getStartTime())
+ .ge(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 1, OrderActivityInfo::getEndTime, orderActivityInfo.getStartTime())
+ .eq(orderActivityInfo.getIsShelf() != null, OrderActivityInfo::getIsShelf, orderActivityInfo.getIsShelf()));
+ page.getRecords().forEach(item -> {
+ LocalDateTime startTime = item.getStartTime();
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime endTime = item.getEndTime();
+ if (endTime.isBefore(now)){
+ item.setStatus(2); //已结束
+ }else if (startTime.isBefore(now)){
+ item.setStatus(1); // 已开始
+ }else {
+ item.setStatus(0); // 未开始
+ }
+
+ String vipIds = item.getVipIds();
+ if (StringUtils.isNotEmpty(vipIds)){
+ String[] vipIdArr = vipIds.split(",");
+ if (vipIdArr.length == 7){
+ item.setVipName("全部");
+ }else {
+ List<String> vipNameList = new ArrayList<>();
+ for (String vipId : vipIdArr) {
+ String vipName = vipSettingService.getById(Long.parseLong(vipId)).getVipName();
+ vipNameList.add(vipName);
+ }
+ item.setVipName(String.join(",", vipNameList));
+ }
+
+ }
+ });
+ return R.ok(page);
}
/**
* 获取活动详情
*/
@GetMapping("/getDetailById")
- @ApiOperation(value = "获取活动详情", tags = {"管理后台-活动管理-订单优惠活动"})
- public R<OrderActivityInfo> getDetailById(@RequestParam("id") Long id){
- return R.ok(orderActivityInfoService.getById(id));
+ @ApiOperation(value = "订单优惠活动-获取活动详情", tags = {"管理后台-活动管理"})
+ public R<OrderActivityInfo> getDetailById(@RequestParam("id") String id){
+ return R.ok(orderActivityInfoService.getById(Long.parseLong(id)));
}
--
Gitblit v1.7.1