From d605391fa5c5ad39ae391d72da66858bdf66ca78 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Sun, 6 Sep 2026 17:40:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E5=B7=A5=E7=A6=8F=E5=88=A9=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96-1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WelfareNoticeController.java | 9 +- .../WelfareUserSelectController.java | 11 +- .../service/WelfareProjectService.java | 9 ++ .../impl/WelfareProjectServiceImpl.java | 34 +++++ .../WelfareSelectionSituationServiceImpl.java | 5 +- .../welfare/selectionSituation/index.html | 2 +- .../platform/zhghh5/welfare/select/index.html | 117 +++++++++++++----- 7 files changed, 141 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareNoticeController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareNoticeController.java index 411d28b..cd29432 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareNoticeController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareNoticeController.java @@ -1,6 +1,5 @@ package com.budwk.app.zhgh.welfare.controller; -import cn.dev33.satoken.annotation.SaCheckLogin; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.result.Result; import com.budwk.app.zhgh.welfare.service.WelfareProjectService; @@ -25,11 +24,10 @@ public class WelfareNoticeController { @Inject private WelfareProjectService projectService; - @At("detail") + @At @Ok("beetl:/platform/zhghh5/welfare/notice/detail.html") - @SaCheckLogin @ApiOperation("福利通知附件详情页") - public void detail() { + public void index() { } /** @@ -38,8 +36,7 @@ public class WelfareNoticeController { * @param id 福利项目 ID * @return JSON 结果，data 中包含项目名称、文件名称、下载地址和 PDF 预览地址 */ - @At("detailData") - @SaCheckLogin + @At @ApiOperation("查询福利通知附件详情") public Result detailData(@Valid String id) { if (StrUtil.isBlank(id)) { diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java index ba314fc..1842866 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java @@ -8,7 +8,6 @@ import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.welfare.model.WelfareList; -import com.budwk.app.zhgh.welfare.model.WelfareProject; import com.budwk.app.zhgh.welfare.model.WelfareUserSelection; import com.budwk.app.zhgh.welfare.service.WelfareProjectService; import io.swagger.annotations.ApiOperation; @@ -24,10 +23,8 @@ import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; -import java.util.Arrays; import java.util.Date; import java.util.List; -import java.util.Objects; @IocBean @Ok("json:full") @@ -92,8 +89,6 @@ public class WelfareUserSelectController { if (count == 0) { return Result.error("您没有选择的权限"); } - WelfareProject project = dao.fetch(WelfareProject.class, projectId); - Date selectTime = new Date(); String additionalInfoValidationMessage = welfareProjectService.validateSelectionAdditionalInfo(selections, selectTime); if (additionalInfoValidationMessage != null) { @@ -111,9 +106,9 @@ public class WelfareUserSelectController { return Result.error(groupQuantityValidationMessage); } - int sum = Arrays.stream(selections).mapToInt(selection -> Objects.requireNonNullElse(selection.getSelectNum(), 0)).sum(); - if (sum > project.getMultiSelectNum()) { - return Result.error("选择的数量不能超过" + project.getMultiSelectNum()); + String projectQuantityValidationMessage = welfareProjectService.validateProjectSelectionQuantity(projectId, selections); + if (projectQuantityValidationMessage != null) { + return Result.error(projectQuantityValidationMessage); } diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java b/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java index 1f1526f..a27082c 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java @@ -52,6 +52,15 @@ public interface WelfareProjectService extends BaseService { */ String validateGroupSelectionQuantity(String projectId, WelfareUserSelection[] selections); + /** + * 校验福利项目一次提交的总选择份数。 + * + * @param projectId 福利项目 ID，用于读取单选或多选模式及多选数量上限 + * @param selections 用户提交的福利选择数组，每项需包含 selectOptionId 和 selectNum + * @return 校验通过返回 {@code null}；超过项目上限或多选项目未配置上限时返回错误提示 + */ + String validateProjectSelectionQuantity(String projectId, WelfareUserSelection[] selections); + /** * 校验福利选择附加信息。同一次提交的全部福利项必须使用相同备注，配送时间字段已停用。 * diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java index 334aea2..9ba009d 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java @@ -201,6 +201,40 @@ public class WelfareProjectServiceImpl extends BaseServiceImpl i return null; } + /** + * 校验福利项目总选择份数。单选项目固定只能选择 1 份，不读取仅供多选项目使用的 + * multiSelectNum；多选项目必须配置有效的数量上限。 + * + * @param projectId 福利项目 ID + * @param selections 当前用户提交的福利选择数据 + * @return 校验通过返回 {@code null}，否则返回可直接展示的错误提示 + */ + @Override + public String validateProjectSelectionQuantity(String projectId, WelfareUserSelection[] selections) { + WelfareProject project = fetch(projectId); + if (project == null) { + return "福利项目不存在"; + } + int selectedQuantity = Arrays.stream(selections == null ? new WelfareUserSelection[0] : selections) + .filter(Objects::nonNull) + .mapToInt(selection -> Objects.requireNonNullElse(selection.getSelectNum(), 0)) + .sum(); + boolean multipleSelection = "checkBox".equals(project.getIsCheckBox()); + int maxSelectQuantity; + if (multipleSelection) { + if (project.getMultiSelectNum() == null || project.getMultiSelectNum() <= 0) { + return "福利项目未配置最多选择数量"; + } + maxSelectQuantity = project.getMultiSelectNum(); + } else { + maxSelectQuantity = 1; + } + if (selectedQuantity > maxSelectQuantity) { + return "选择的数量不能超过" + maxSelectQuantity; + } + return null; + } + /** * 校验一次选择提交中的备注。配送时间字段已停用，新提交数据统一清空该字段； * 多项福利的备注必须一致，避免同一次选择出现互相冲突的附加信息。 diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java index 9338df1..c073789 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java @@ -145,7 +145,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl{{ optionRankText(option) }} -
-
+
+
{{ optionBrief(option) }}
@@ -847,7 +848,8 @@ layout("/layouts/platform_h5.html"){ integer disable-input :min="option.isSystemDefault ? 1 : 0" - :max="projectInfo.isCheckBox === 'radio' ? 1 : selectionLimit" + :max="getOptionMaxSelectNum(option)" + :disable-plus="isOptionIncreaseDisabled(option)" :disabled="isDeadlinePassed || (projectInfo.isCheckBox === 'radio' && systemDefaultOption && systemDefaultOption.id !== option.id)" input-width="40px" button-size="22px" @@ -984,9 +986,11 @@ layout("/layouts/platform_h5.html"){ + @close="handleHistoryLayerComponentClose('detail')">
-
+
+
@@ -1196,6 +1200,20 @@ layout("/layouts/platform_h5.html"){ const text = (div.textContent || div.innerText || "").replace(/\s+/g, " ").trim() return text }, + /** + * 判断福利选项是否存在可展示的详情内容。 + * @param option 福利选项，详情来源为 description 字段。 + * @returns {boolean} 存在文字或富媒体内容时返回 true，否则详情弹框显示“暂无详情”。 + */ + hasOptionDetail(option) { + if (!option || !option.description) { + return false + } + const div = document.createElement("div") + div.innerHTML = option.description + const text = (div.textContent || div.innerText || "").replace(/\s+/g, " ").trim() + return !!text || !!div.querySelector("img,table,video,audio,iframe") + }, selectNumChange(index, newValue) { const option = this.projectInfo.options[index]; if (option.isSystemDefault && Number(newValue) < 1) { @@ -1203,6 +1221,12 @@ layout("/layouts/platform_h5.html"){ this.$toast.fail("系统默认福利不可取消") return } + if (!this.projectInfo.singleOptionSupportMultipleSelection && Number(newValue) > 1) { + this.$set(option, "selectNum", 1) + this.$set(option, "selectNumKey", (option.selectNumKey || 0) + 1) + this.$toast.fail("此套餐最多只能选择1份") + return + } const maxSelect = this.projectInfo.multiSelectNum || this.projectInfo.options.length; // 计算其他所有选项的总和（不包括当前修改的选项） @@ -1223,7 +1247,7 @@ layout("/layouts/platform_h5.html"){ // 如果当前选项的值大于允许的最大值，则调整它 if (option.selectNum > maxAllowedForThisOption) { - option.selectNum = maxAllowedForThisOption; + this.$set(option, "selectNum", maxAllowedForThisOption) } // 如果当前选项的值小于或等于允许的最大值（例如，用户减少了数量导致总数超标，但实际上减少后并未超过 maxSelect， // 这种情况理论上不应该在 change 时发生，因为 change 是值改变后触发的，且 change 后的值导致了超标）， @@ -1247,6 +1271,44 @@ layout("/layouts/platform_h5.html"){ return Number(option.selectNum) || 0 }, + /** + * 计算当前选项可达到的最大份数。 + * 多选项目同时受项目剩余份数和单个套餐是否允许多份控制；单选项目固定为1。 + * @param option 当前福利选项，selectNum为已选份数 + * @return {number} 传给步进器max属性的最大份数 + */ + getOptionMaxSelectNum(option) { + if (this.projectInfo.isCheckBox === "radio") { + return 1 + } + const currentQuantity = Number(option.selectNum) || 0 + const globalAllowedQuantity = currentQuantity + this.remainingSelectionCount + if (!this.projectInfo.singleOptionSupportMultipleSelection) { + return Math.min(1, globalAllowedQuantity) + } + return globalAllowedQuantity + }, + + /** + * 判断当前选项是否还能增加份数。 + * 达到项目总上限或单个套餐已达到1份且不允许多份时禁用加号，但不影响减号取消。 + * @param option 当前福利选项，selectNum为已选份数 + * @return {boolean} true表示禁用当前步进器的加号 + */ + isOptionIncreaseDisabled(option) { + if (this.isDeadlinePassed) { + return true + } + if (this.projectInfo.isCheckBox === "radio") { + return this.selectedRadioId === option.id + } + const currentQuantity = Number(option.selectNum) || 0 + if (!this.projectInfo.singleOptionSupportMultipleSelection && currentQuantity >= 1) { + return true + } + return this.remainingSelectionCount <= 0 + }, + /** * 统一处理单选和多选项目的数量变化，保持原有默认项及总数量限制。 * @param index 福利选项索引 @@ -1261,16 +1323,28 @@ layout("/layouts/platform_h5.html"){ return } if (option.isSystemDefault) return - this.selectedRadioId = "" - this.projectInfo.options.forEach((item) => { - item.selectNum = 0 - }) + this.syncRadioOptionSelection("") return } this.$set(option, "selectNum", quantity) this.selectNumChange(index, quantity) }, + /** + * 同步单选项目的选中项和全部步进器显示值。 + * @param optionId 当前选中的福利选项 ID；传空字符串表示取消当前选择 + * @return {void} 无返回值，未选项统一显示 0，选中项显示 1 + */ + syncRadioOptionSelection(optionId) { + this.$set(this, "selectedRadioId", optionId || "") + if (!this.projectInfo.options) return + this.projectInfo.options.forEach((option) => { + this.$set(option, "selectNum", option.id === optionId ? 1 : 0) + // Vant Stepper 会保留内部显示值，切换单选项时更新 key 强制同步所有控件。 + this.$set(option, "selectNumKey", (option.selectNumKey || 0) + 1) + }) + }, + // 保留原有首次选择方法，兼容其他调用入口。 selectCheckboxOption(index) { if (this.isDeadlinePassed) { @@ -1366,11 +1440,7 @@ layout("/layouts/platform_h5.html"){ if (this.projectInfo.options && this.userSelection.length > 0) { // 单选模式 if (this.projectInfo.isCheckBox === "radio" && this.userSelection[0]) { - this.selectedRadioId = this.userSelection[0].selectOptionId - const selectedOption = this.projectInfo.options.find((opt) => opt.id === this.selectedRadioId) - if (selectedOption) { - selectedOption.selectNum = 1 - } + this.syncRadioOptionSelection(this.userSelection[0].selectOptionId) } // 多选模式 else { @@ -1620,22 +1690,11 @@ layout("/layouts/platform_h5.html"){ return } if (this.systemDefaultOption && this.systemDefaultOption.id !== optionId) { - this.selectedRadioId = this.systemDefaultOption.id + this.syncRadioOptionSelection(this.systemDefaultOption.id) this.$toast.fail("系统默认福利不可取消") return } - this.selectedRadioId = optionId - - // 重置所有选项的selectNum - if (this.projectInfo.options) { - this.projectInfo.options.forEach((option) => { - if (option.id === optionId) { - option.selectNum = 1 - } else { - option.selectNum = 0 - } - }) - } + this.syncRadioOptionSelection(optionId) }, // 默认项只在首次选择时自动带入，已有历史选择不自动覆盖。