From 0ab1b864458f36b294933112824b10b13770915e Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期五, 07 七月 2023 21:12:43 +0800 Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java index 6c75879..d96ecdc 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java @@ -60,9 +60,27 @@ String COUPON_EXPIRED = "优惠券已过期"; - String COUPON_USED = "优惠券已被核销"; + String COUPON_USED = "该核销码已核销,请更换"; String COUPON_TYPE_ERROR = "只能核销商品优惠券"; String STAFF_MOBILE_DOUBLE = "手机号码已被注册"; + + String SHOP_USER_DOUBLE = "账号已经关联其他商户登录"; + + String COUPON_AUDIT_EDIT = "只能编辑审核拒绝的优惠券"; + + String VERIFY_USED = "该核销码已核销,请更换"; + + String VERIFY_SHOP_ERROR = "该核销码不适用于本店铺"; + + String ACTIVITY_NO_START = "活动还未开始"; + + String ACTIVITY_END = "活动已经结束"; + + String ACTIVITY_GOODS_NULL = "商品已售罄"; + + String BIRTHDAY_NULL = "未填写生日"; + + String BIRTHDAY_ERROR = "只有生日当月领取"; } -- Gitblit v1.7.1