From 5d3f48d2842b9c5cbd336a013fb6cd8ea2a3eb6b Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 13 十二月 2024 15:12:30 +0800
Subject: [PATCH] 1.后台管理-评论 2.后台管理-门店特殊价
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 d155ebc..3815af6 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,6 +7,7 @@
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;
@@ -34,6 +35,8 @@
@Resource
private OrderActivityInfoService orderActivityInfoService;
+ @Resource
+ private VipSettingService vipSettingService;
/**
@@ -107,6 +110,22 @@
}else {
item.setStatus(0); // 未开始
}
+
+ String vipIds = item.getVipIds();
+ if (StringUtils.isNotEmpty(vipIds)){
+ String[] vipIdArr = vipIds.split(",");
+ if (vipIdArr.length == 7){
+ item.setVipIds("全部");
+ }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);
}
--
Gitblit v1.7.1