From ccbd86bc5f747b748b5bde257a789d748b8cefbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Sep 2025 17:41:35 +0800
Subject: [PATCH] ``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中，对happyActivity的categoryId进行了非空检查，并且确认categoryMap中包含该categoryId后，再设置其categoryName。这样可以避免因为空值或不存在的键导致的潜在异常。 ```
---
src/main/resources/templates/febs/views/modules/votesActivity/discountUpdate.html | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 57 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/votesActivity/discountUpdate.html b/src/main/resources/templates/febs/views/modules/votesActivity/discountUpdate.html
index f3617d2..1023245 100644
--- a/src/main/resources/templates/febs/views/modules/votesActivity/discountUpdate.html
+++ b/src/main/resources/templates/febs/views/modules/votesActivity/discountUpdate.html
@@ -46,6 +46,7 @@
<label class="layui-form-label febs-form-item-require">类型：</label>
<div class="layui-input-block">
<select name="type">
+ <option value="">请选择</option>
<option value="1">普通活动</option>
<option value="2">众筹活动</option>
<option value="3">投票活动</option>
@@ -56,6 +57,7 @@
<label class="layui-form-label febs-form-item-require">推荐首页：</label>
<div class="layui-input-block">
<select name="hotState">
+ <option value="">请选择</option>
<option value="0">不推荐</option>
<option value="1">推荐</option>
</select>
@@ -91,6 +93,7 @@
<label class="layui-form-label febs-form-item-require">自主报名：</label>
<div class="layui-input-block">
<select name="addState">
+ <option value="">请选择</option>
<option value="0">不允许</option>
<option value="1">允许</option>
</select>
@@ -122,14 +125,13 @@
<label class="layui-form-label febs-form-item-require">门票售卖：</label>
<div class="layui-input-block">
<select name="payState">
+ <option value="">请选择</option>
<option value="0">关闭</option>
<option value="1">开启</option>
</select>
+ <div class="layui-form-mid layui-word-aux">关闭的情况下，门票总数，门票价格，请填写0</div>
</div>
</div>
- </div>
-
- <div class="layui-row layui-col-space10 layui-form-item">
<div class="layui-col-lg6">
<label class="layui-form-label febs-form-item-require">门票总数：</label>
<div class="layui-input-block">
@@ -138,12 +140,42 @@
<div class="layui-form-mid layui-word-aux">门票总数</div>
</div>
</div>
+ </div>
+
+ <div class="layui-row layui-col-space10 layui-form-item">
+ <div class="layui-col-lg6">
+ <label class="layui-form-label febs-form-item-require">门票剩余：</label>
+ <div class="layui-input-block">
+ <input type="text" name="surplusCnt" lay-verify="required"
+ placeholder="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
<div class="layui-col-lg6">
<label class="layui-form-label febs-form-item-require">门票价格：</label>
<div class="layui-input-block">
<input type="text" name="payAmount" lay-verify="required"
placeholder="" autocomplete="off" class="layui-input">
<div class="layui-form-mid layui-word-aux">门票价格（关闭众筹，或者免费参与，请填写0）</div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="layui-row layui-col-space10 layui-form-item">
+ <div class="layui-col-lg6">
+ <label class="layui-form-label febs-form-item-require">积分：</label>
+ <div class="layui-input-block">
+ <input type="text" name="scoreCnt" lay-verify="required"
+ placeholder="" autocomplete="off" class="layui-input">
+ <div class="layui-form-mid layui-word-aux">参与活动获得积分</div>
+ </div>
+ </div>
+ <div class="layui-col-lg6">
+ <label class="layui-form-label febs-form-item-require">成长值：</label>
+ <div class="layui-input-block">
+ <input type="text" name="growthCnt" lay-verify="required"
+ placeholder="" autocomplete="off" class="layui-input">
+ <div class="layui-form-mid layui-word-aux">参与活动获得成长值</div>
</div>
</div>
</div>
@@ -354,28 +386,31 @@
}
form.val("activity-discount-update-form", {
- "id": activity.id || '',
- "name": activity.name || '',
- "type": activity.type || '',
- "joinCnt": activity.joinCnt || '',
- "startTime": activity.startTime || '',
- "endTime": activity.endTime || '',
- "phone": activity.phone || '',
- "address": activity.address || '',
- "payState": activity.payState || '',
- "payAmount": activity.payAmount || '',
- "orderCnt": activity.orderCnt || '',
- "hotState": activity.hotState || '',
- "voteCnt": activity.voteCnt || '',
- "addState": activity.addState || ''
+ "id": activity.id,
+ "name": activity.name,
+ "type": activity.type,
+ "joinCnt": activity.joinCnt,
+ "startTime": activity.startTime,
+ "endTime": activity.endTime,
+ "phone": activity.phone,
+ "address": activity.address,
+ "payState": activity.payState,
+ "payAmount": activity.payAmount,
+ "orderCnt": activity.orderCnt,
+ "hotState": activity.hotState,
+ "surplusCnt": activity.surplusCnt,
+ "voteCnt": activity.voteCnt,
+ "addState": activity.addState,
+ "growthCnt": activity.growthCnt,
+ "scoreCnt": activity.scoreCnt,
});
- $('#demoMax').append('<img src="' + activity.backImg + '" alt="" class="layui-upload-img single-image" style="width: 130px">')
+ $('#demoMax').append('<img src="' + activity.backImg + '" alt="" class="layui-upload-img single-image" style="width: 130px">');
$("#backImg").val(activity.backImg);
- $('#demo1Max').append('<img src="' + activity.indexImg + '" alt="" class="layui-upload-img single-image" style="width: 130px">')
+ $('#demo1Max').append('<img src="' + activity.indexImg + '" alt="" class="layui-upload-img single-image" style="width: 130px">');
$("#indexImg").val(activity.indexImg);
var arr = [];
- arr.push(activity.categoryId)
+ arr.push(activity.categoryId);
activityGroup.setValue(arr);
editor.txt.html(activity.textRemark);
@@ -384,8 +419,8 @@
form.on('submit(activity-discount-update-form-submit)', function (data) {
- data.field.groupId = activityGroup.getValue('valueStr');
- data.field.introduce = editor.txt.html();
+ data.field.categoryId = activityGroup.getValue('valueStr');
+ data.field.textRemark = editor.txt.html();
$.ajax({
'url':ctx + 'admin/happyActivity/activityUpdate',
'type':'post',
--
Gitblit v1.9.1