From 5239e5e018b8114bbed9407aad92e3e07e4585a5 Mon Sep 17 00:00:00 2001 From: zt Date: Fri, 13 Dec 2024 09:24:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E6=B7=BB=E5=8A=A0=E9=97=A8?= =?UTF-8?q?=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/admin/group/vo/MemberGroupBaseVO.java | 3 +++ .../controller/app/storeorder/AppStoreOrderController.java | 3 +-- .../module/member/dal/dataobject/group/MemberGroupDO.java | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupBaseVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupBaseVO.java index a282418e..84aa86da 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupBaseVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupBaseVO.java @@ -29,4 +29,7 @@ public class MemberGroupBaseVO { @Schema(description = "管理员Id", example = "1") private Long userId; + @Schema(description = "食堂Id", example = "1") + private Long carteenId; + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java index 5e234fcb..3c76275d 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java @@ -155,8 +155,7 @@ public class AppStoreOrderController { boolean isInRange = startToNow.isZero() ||!startToNow.isNegative() && startToNow.compareTo(startToEnd) <= 0; if(isInRange){ - String msg = String.format("购买失败，请在%s-%s之间购买", start, end); - throw exception(new ErrorCode(1_007_904_009, msg)); + throw exception(new ErrorCode(1_007_904_009, "请明天购买")); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/group/MemberGroupDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/group/MemberGroupDO.java index 6b2733c9..05957dd7 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/group/MemberGroupDO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/group/MemberGroupDO.java @@ -45,4 +45,9 @@ public class MemberGroupDO extends BaseDO { * 用户id */ private Long userId; + + /** + * 食堂Id + */ + private Long carteenId; }