From eb5d7885fa9e4bd20c0827eec9b4cdd48c47b509 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 07 一月 2025 09:11:20 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 3815af6..f91120f 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
@@ -48,6 +48,7 @@
@PostMapping("/getNowOrderActivityInfo")
public R<OrderActivityInfo> getNowOrderActivityInfo(@RequestParam("vip") Integer vip){
OrderActivityInfo one = orderActivityInfoService.getOne(new LambdaQueryWrapper<OrderActivityInfo>().eq(OrderActivityInfo::getDelFlag, 0)
+ .eq(OrderActivityInfo::getIsShelf, 1).eq(OrderActivityInfo::getStatus, 1)
.last(" and now() between start_time and end_time and FIND_IN_SET(" + vip + ", vip_ids) limit 0, 1"));
return R.ok(one);
}
@@ -77,7 +78,7 @@
* 修改活动
*/
@PostMapping("/update")
- @ApiOperation(value = "修改活动", tags = {"管理后台-活动管理-订单优惠活动"})
+ @ApiOperation(value = "修改活动", tags = {"管理后台-活动管理"})
public R<Void> updateActivityConfig(@RequestBody OrderActivityInfo orderActivityInfo){
orderActivityInfo.setId(Long.valueOf(orderActivityInfo.getIdStr()));
orderActivityInfoService.updateById(orderActivityInfo);
@@ -115,7 +116,7 @@
if (StringUtils.isNotEmpty(vipIds)){
String[] vipIdArr = vipIds.split(",");
if (vipIdArr.length == 7){
- item.setVipIds("全部");
+ item.setVipName("全部");
}else {
List<String> vipNameList = new ArrayList<>();
for (String vipId : vipIdArr) {
--
Gitblit v1.7.1