From ba714629588e22f9ffaab83819f6b9200a6397b3 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期五, 04 八月 2023 22:59:08 +0800
Subject: [PATCH] 1、定时任务 商户进件状态查询 2、小程序下单统一支付提交 3、订单核销分账(未完成)

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java |   10 ++++++++--
 1 files changed, 8 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 d32ef24..5a0490a 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_GOODS_NULL = "商品已被抢完";
+
+    String ACTIVITY_GOODS_BEYOND = "超出商品购买限制";
 
     String BIRTHDAY_NULL = "未填写生日";
 
@@ -97,4 +101,6 @@
     String ACTIVITY_TIME_ERROR = "只能选择大于当前时间作为开始时间";
 
     String TRANS_NOT_MYSELF = "不能转移给自己";
+
+    String GOODS_SURE_FAILED = "商品没有确认次数";
 }

--
Gitblit v1.7.1