From d3e29108e70d52efa2e0fc239b0daa0586b732b8 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 28 Apr 2025 15:23:27 +0800
Subject: [PATCH] feat(mall): 添加活动预期数量和剩余数量字段
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java | 2 ++
src/main/resources/templates/febs/views/modules/votesActivity/orderList.html | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
index f453620..7fc6010 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
@@ -207,6 +207,8 @@
happyActivity.setName(dto.getName());
happyActivity.setType(dto.getType());
happyActivity.setJoinCnt(dto.getJoinCnt());
+ happyActivity.setExpectCnt(dto.getJoinCnt());
+ happyActivity.setSurplusCnt(dto.getSurplusCnt());
happyActivity.setStartTime(dto.getStartTime());
happyActivity.setEndTime(dto.getEndTime());
happyActivity.setPhone(dto.getPhone());
diff --git a/src/main/resources/templates/febs/views/modules/votesActivity/orderList.html b/src/main/resources/templates/febs/views/modules/votesActivity/orderList.html
index b79498b..a53230f 100644
--- a/src/main/resources/templates/febs/views/modules/votesActivity/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/votesActivity/orderList.html
@@ -78,6 +78,9 @@
2: {title: '待使用', color: 'orange'},
3: {title: '已使用', color: 'green'},
4: {title: '售后', color: 'red'},
+ 5: {title: '已评价', color: 'black'},
+ 6: {title: '删除', color: 'black'},
+ 7: {title: '已失效', color: 'black'},
}[d.state];
}}
<span class="layui-badge febs-bg-{{state.color}}">{{ state.title }}</span>
--
Gitblit v1.9.1