From 1442f149019ee0590389abd7a88a79c4d9b59034 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 五月 2025 18:23:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java | 72 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 10 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
index 6e9d5af..9175cf2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
@@ -9,7 +9,7 @@
/**
* 微信获取授权openId地址
*/
- public static final String WX_OPENID_ADDRESS = "https://api.weixin.qq.com/sns/jscode2sess";
+ public static final String WX_OPENID_ADDRESS = "https://api.weixin.qq.com/sns/jscode2session";
/**
* UTF-8 字符集
@@ -146,11 +146,8 @@
* 订单记录excel模板名称
*/
public static final String EXCEL_ORDER_FILE_NAME = "订单记录";
-
- /**
- * 文件上传常量后缀
- */
- public static final String APK = "apk";
+ public static final String EXCEL_ORDER_FILE_NAME1 = "加盟商余额记录";
+ public static final String EXCEL_ORDER_FILE_NAME2 = "加盟商扣款记录";
/**
* 用户编号生成前缀
@@ -188,6 +185,16 @@
public static final String REJECT_STR = "已驳回";
/**
+ * 家电以旧换新
+ */
+ public static final String TRADE_IN = "家电以旧换新";
+
+ /**
+ * 预约上门回收
+ */
+ public static final String RECOVERY = "预约上门回收";
+
+ /**
* 数字60
*/
public static final Integer SIXTY = 60;
@@ -213,6 +220,11 @@
public static final Integer THREE = 3;
/**
+ * 数字4
+ */
+ public static final Integer FOUR = 4;
+
+ /**
* 数字5
*/
public static final Integer FIVE = 5;
@@ -223,19 +235,39 @@
public static final Integer SIX = 6;
/**
+ * 数字10
+ */
+ public static final Integer TEN = 10;
+
+ /**
* 数字18
*/
public static final Integer EIGHTEEN = 18;
/**
- * 数字18
+ * 数字8
*/
- public static final Integer EIGHT = 18;
+ public static final Integer EIGHT = 8;
+
+ /**
+ * 数字 30
+ */
+ public static final Integer THIRTY = 30;
+
+ /**
+ * 数字100
+ */
+ public static final Integer ONE_HUNDRED = 100;
+
+ /**
+ * 数字 365
+ */
+ public static final Integer YEAR_DAY = 365;
/**
* 数字 3000
*/
- public static final Integer THREE_THOUSAND = 3000;
+ public static final Integer THREE_THOUSAND = 2000;
/**
* 师傅端默认用户ID前缀
@@ -243,13 +275,33 @@
public static final String DEFAULT_USER_NUMBER_PRE = "用户";
/**
+ * 师傅端默认用户ID前缀
+ */
+ public static final String SUBSIDY_MONEY = "¥";
+
+ /**
+ * 师傅端默认用户ID前缀
+ */
+ public static final String PROVINCE = "省";
+
+ /**
+ * 师傅端默认用户ID前缀
+ */
+ public static final String MARKET = "市";
+
+ /**
* 师傅端默认密码
*/
public static final String DEFAULT_PASSWORD = "123456";
/**
+ * 三端默认验证码
+ */
+ public static final String DEFAULT_PHONE_CODE = "123456";
+
+ /**
* 手机号码正则
*/
- public static final String PHONE = ("^((13[0-9])|(14[0,1,4-9])|(15[0-3,5-9])|(16[2,5,6,7])|(17[0-8])|(18[0-9])|(19[0-3,5-9]))\\d{8}$");
+ public static final String PHONE = "^1[3456789]\\d{9}$";
}
--
Gitblit v1.7.1