From b1dac74d37436c91646fb849813c0012a6703862 Mon Sep 17 00:00:00 2001 From: dd3s_206 Date: Fri, 29 May 2026 11:33:34 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=88=B1=E5=BF=83=E5=B8=AE=E6=89=B6?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F-=E4=BD=93=E6=A3=80=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=EF=BC=9A=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E2=80=98=E5=AF=BC=E5=87=BA=E6=95=99=E8=81=8C=E5=B7=A5?= =?UTF-8?q?=E6=9C=AA=E9=80=89=E5=90=8D=E5=8D=95=E2=80=99=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E9=A1=B9=E7=9B=AEid=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HealthCheckupSingleServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java index 2d8cece..0c4b4c1 100644 --- a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java @@ -212,6 +212,8 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl Date: Fri, 29 May 2026 15:47:35 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=88=B1=E5=BF=83=E5=B8=AE=E6=89=B6?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F-=E4=BD=93=E6=A3=80=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E4=BD=93=E6=A3=80=E5=90=8D=E5=8D=95=EF=BC=9A=20=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=9B=A0=E4=B8=BA=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=90=8E=E8=A1=A8=E6=A0=BC=E7=95=99=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E5=A4=9A=E4=BD=99=E6=97=A0=E6=95=88=E5=88=97=EF=BC=88?= =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93=E4=B8=BA=E4=BB=80=E4=B9=88=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E6=98=AF=E7=94=A8=E6=88=B7=E8=A6=81=E6=B1=82=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E5=89=8D=E7=A6=BB=E8=81=8C=E5=90=8C=E4=BA=8B=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E7=9A=84=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/views/platform/healthCheckup/listMange.html | 4 ++-- .../views/platform/healthCheckup/statisticsSingle.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/views/platform/healthCheckup/listMange.html b/src/main/resources/views/platform/healthCheckup/listMange.html index 73ce69d..9c2a563 100644 --- a/src/main/resources/views/platform/healthCheckup/listMange.html +++ b/src/main/resources/views/platform/healthCheckup/listMange.html @@ -327,8 +327,8 @@ layout("/layouts/platform.html"){ // { prop: "unionGroupName", label: "工会小组", sortable: true, checked: 0 }, { prop: "optionName", label: "所选套餐", width: "100px" }, { prop: "selectTime", label: "选择时间", width: "160px" }, - { prop: "isAudit", label: "是否确认" }, - { prop: "auditTime", label: "确认时间" } + /*{ prop: "isAudit", label: "是否确认" }, + { prop: "auditTime", label: "确认时间" }*/ // {prop: 'userSign', label: '签字', width: "100px"}, ], exportHealthCheckupDialog: false, diff --git a/src/main/resources/views/platform/healthCheckup/statisticsSingle.html b/src/main/resources/views/platform/healthCheckup/statisticsSingle.html index 85925b2..bac8380 100644 --- a/src/main/resources/views/platform/healthCheckup/statisticsSingle.html +++ b/src/main/resources/views/platform/healthCheckup/statisticsSingle.html @@ -405,7 +405,7 @@ layout("/layouts/platform.html"){ this.tableColumns.push( { prop: "totalCount", label: "选取人数" }, { prop: "unselectedTeacherSum", label: "未选人数" }, - { prop: "isAudit", label: "是否核对" } + // { prop: "isAudit", label: "是否核对" } ) this.$refs.table_tool.getColumns() if (!this.pageForm.projectId) { From 93eac307ecaa100fe9a4d5e23c09a95a42f71df9 Mon Sep 17 00:00:00 2001 From: dd3s_206 Date: Tue, 2 Jun 2026 10:33:43 +0800 Subject: [PATCH 3/8] =?UTF-8?q?h5=E6=89=8B=E6=9C=BA=E7=AB=AF-=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E9=80=89=E6=8B=A9=EF=BC=9A=E5=85=B3=E9=97=AD=E5=8F=96?= =?UTF-8?q?=E8=B4=A7=E9=97=A8=E5=BA=97=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhgh/mobile/welfare/MWelfareController.java | 5 ++++- .../controller/WelfareCommonController.java | 3 +++ .../welfare/controller/WelfareMineController.java | 3 +++ .../controller/WelfareUserChooseController.java | 10 ++++++++-- .../views/mobile/welfare/list/receive.html | 14 +++++--------- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/mobile/welfare/MWelfareController.java b/src/main/java/io/v/nutz/zhgh/mobile/welfare/MWelfareController.java index 95b5d16..1872a0a 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/welfare/MWelfareController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/welfare/MWelfareController.java @@ -191,10 +191,13 @@ public class MWelfareController { */ @At public Result validateUserIntegral(String projectId, String totalIntegral) { - BigDecimal totalIntegralBig = new BigDecimal(totalIntegral); if (StrUtil.isBlank(projectId)) { return Result.error("数据错误！"); } + if (StrUtil.isBlank(totalIntegral)) { + return Result.error("请选择后在提交！"); + } + BigDecimal totalIntegralBig = new BigDecimal(totalIntegral); WelfareList welfareList = dao.fetch(WelfareList.class, Cnd.where("projectId", "=", projectId).and("userId", "=", ShiroUtil.getPrincipalProperty("id"))); if (welfareList == null) { return Result.error("您暂无此福利！"); diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareCommonController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareCommonController.java index 2f77c16..686d4f7 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareCommonController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareCommonController.java @@ -631,6 +631,9 @@ public class WelfareCommonController { //需要去查询最新的物流信息 String receiveAddress = userSelection.getReceiveAddress(); + if (StrUtil.isBlank(receiveAddress) || receiveAddress.length() < 11) { + continue; + } String mobile = receiveAddress.substring(receiveAddress.length() - 11); JSONObject jsonObject = expressSelectUtil.getExpressInfo(courierNumber.getCourierNumber(), mobile); diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMineController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMineController.java index a5484e0..e4f26f1 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMineController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMineController.java @@ -195,6 +195,9 @@ public class WelfareMineController { } } String receiveAddress = userSelection.getReceiveAddress(); + if (StrUtil.isBlank(receiveAddress) || receiveAddress.length() < 11) { + return Result.error("收货信息为空，无法查询物流信息"); + } String mobile = receiveAddress.substring(receiveAddress.length() - 11); JSONObject jsonObject = expressSelectUtil.getExpressInfo(courierNumber, mobile); diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareUserChooseController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareUserChooseController.java index 4dcb2f0..acb6cc0 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareUserChooseController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareUserChooseController.java @@ -186,7 +186,10 @@ public class WelfareUserChooseController { } //如果是积分模式 - if (project.getIsIntegralMode()) { + if (Boolean.TRUE.equals(project.getIsIntegralMode())) { + if (StrUtil.isBlank(totalIntegral)) { + return Result.error("请选择后在提交！"); + } BigDecimal totalIntegralBig = new BigDecimal(totalIntegral); totalIntegralBig = totalIntegralBig.divide(BigDecimal.valueOf(100)); if (totalIntegralBig.compareTo(BigDecimal.ZERO) == 0) { @@ -209,7 +212,10 @@ public class WelfareUserChooseController { for (WelfareUserSelection welfareUserSelection : welfareUserSelections) { welfareUserSelection.setSelectUserId(userId); welfareUserSelection.setSelectTime(new Date()); - if (welfareUserSelection.getSelectNum() > 1 && !project.getIsIntegralMode()) { + if (StrUtil.isBlank(welfareUserSelection.getReceiveAddress())) { + welfareUserSelection.setReceiveAddress(""); + } + if (welfareUserSelection.getSelectNum() > 1 && !Boolean.TRUE.equals(project.getIsIntegralMode())) { return Result.error("福利选择限制超过最大限制"); } } diff --git a/src/main/resources/views/mobile/welfare/list/receive.html b/src/main/resources/views/mobile/welfare/list/receive.html index 184e138..3fc2077 100644 --- a/src/main/resources/views/mobile/welfare/list/receive.html +++ b/src/main/resources/views/mobile/welfare/list/receive.html @@ -348,9 +348,12 @@ layout("/mobile/platform.html"){ + + @@ -676,13 +679,9 @@ layout("/mobile/platform.html"){ return } - const notReceiveAddress = [] const formData = this.projectInfo.welfareProjectSubjects[0].options .filter((v) => v.selectNum >= 1) .map((v) => { - if (v.shoppingId && !v.receiveAddress) { - notReceiveAddress.push(v.optionName) - } return { welfareId: this.projectId, subjectId: v.subjectId, @@ -692,14 +691,11 @@ layout("/mobile/platform.html"){ selectNum: v.selectNum } }) - if (notReceiveAddress.length > 0) { - this.$modal.msg("请选择取货门店：" + notReceiveAddress.join(",")) - return - } const {code, msg, data} = await $.post("/platform/welfare/userChoose/confirmSelect", { welfareUserSelections: JSON.stringify(formData), projectId: this.projectId, - mobile: this.mobile + mobile: this.mobile, + totalIntegral: this.totalIntegral }) if (code === 0) { this.getUserSelection(this.projectId) From 4ce837abdf48ec03ebcbbb07a12e94414014f112 Mon Sep 17 00:00:00 2001 From: dd3s_206 Date: Tue, 2 Jun 2026 11:38:24 +0800 Subject: [PATCH 4/8] =?UTF-8?q?h5=E6=89=8B=E6=9C=BA=E7=AB=AF-=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E9=80=89=E6=8B=A9=EF=BC=9A=E5=85=B3=E9=97=ADh5?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=80=89=E6=8B=A9=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=8F=96=E8=B4=A7=E9=97=A8=E5=BA=97=E6=A0=8F?= =?UTF-8?q?=EF=BC=8C=E9=99=90=E5=88=B6=E6=94=B6=E8=8E=B7=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=9C=A8=E5=93=88=E5=B0=94=E6=BB=A8=E6=8C=87=E5=AE=9A=E7=9A=84?= =?UTF-8?q?=E8=BE=96=E5=8C=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WelfareAddressManageController.java | 6 +- .../views/mobile/welfare/list/receive.html | 81 +++++++++++- .../views/platform/welfare/userChoose.html | 117 +++++++++++++----- 3 files changed, 169 insertions(+), 35 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareAddressManageController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareAddressManageController.java index 1ef44ea..4769ae2 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareAddressManageController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareAddressManageController.java @@ -73,7 +73,11 @@ public class WelfareAddressManageController { @ViReturn @RequiresPermissions("welfare.addressManage") public Object doDefault(String id) { - simpleService.dao().update(WelfareMemberAddress.class, Chain.make("isDefault", false), Cnd.where("userId", "=", ShiroUtil.getUserId())); + WelfareMemberAddress address = simpleService.dao().fetch(WelfareMemberAddress.class, id); + if (address == null) { + return null; + } + simpleService.dao().update(WelfareMemberAddress.class, Chain.make("isDefault", false), Cnd.where("userId", "=", address.getUserId())); simpleService.dao().update(WelfareMemberAddress.class, Chain.make("isDefault", true), Cnd.where("id", "=", id)); return null; } diff --git a/src/main/resources/views/mobile/welfare/list/receive.html b/src/main/resources/views/mobile/welfare/list/receive.html index 3fc2077..4a134ed 100644 --- a/src/main/resources/views/mobile/welfare/list/receive.html +++ b/src/main/resources/views/mobile/welfare/list/receive.html @@ -288,8 +288,11 @@ layout("/mobile/platform.html"){ v-model="selectAddressPopup">
配送至
+
+ 可配送辖区：哈尔滨市{{receiveAddressAreaText}} +