From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 39c5b55..300921c 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
@@ -12,7 +12,7 @@
String USER_NOT_LOGIN = "用户没有登录或登录已失效";
- String USER_NO_SHOP = "用户没有关联商户";
+ String USER_NO_SHOP = "未查询到用户关联商户";
String USER_NO_SYSTEM = "员工没有录入系统";
@@ -25,6 +25,8 @@
String GOODS_DOWN = "商品已下架";
String INTEGRAL_USE_FAILED = "积分不够支付";
+
+ String CANCEL_CANCEL_ORDER = "订单已被取消";
String CANCEL_ERROR_ORDER = "已核销订单不能取消";
@@ -82,7 +84,9 @@
String ACTIVITY_END = "活动已经结束";
- String ACTIVITY_GOODS_NULL = "商品已售罄";
+ String ACTIVITY_SE_ERROR = "开始时间不能大于结束时间";
+
+ String ACTIVITY_GOODS_NULL = "商品已被抢完";
String ACTIVITY_GOODS_BEYOND = "超出商品购买限制";
@@ -99,4 +103,8 @@
String ACTIVITY_TIME_ERROR = "只能选择大于当前时间作为开始时间";
String TRANS_NOT_MYSELF = "不能转移给自己";
+
+ String GOODS_SURE_FAILED = "商品没有确认次数";
+
+ String BIRTHDAYCARD_NO_GIFT = "请先配置礼物再开启";
}
--
Gitblit v1.7.1