From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
index ff36166..682379b 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
@@ -110,19 +110,6 @@
public static final String SAFEPATH = "/su";
public static final String TOKEN_KEY = "token";
- /**
- * 保存在cookie 中的token
- */
- public static final String USER_TOKEN_COOKIE = "token";
- public static final String COOKIE_TIME_OUT = "cookie_time_out";
- /**
- * nginx访问地址
- */
- public static final String NGINX_URL = "static_resource_url";
- /**
- * 存储路径
- */
- public static final String FILES_TORAGE_PATH = "file_storage_path";
/**
* 过滤特殊字符
@@ -579,6 +566,24 @@
public static final String SHOP_MANAGE_JJCPAS_CONSUME = "shopManageJjcpasConsume";
/**
+ * 门店是否只能取消待付款订单,服务单
+ */
+ public static final String SHOP_MANAGE_ABLE_CANCEL_DFK_ORDER = "shopManageAbleCancelDfkOrder";
+ /**
+ * 服务记录跟进模板
+ */
+ public static final String SERVICE_FLOW_TEMPLATE = "SERVICE_FLOW_TEMPLATE";
+ /**
+ * 开启短信提醒
+ */
+ public static final String OPEN_SMS_NOTICE = "OPEN_SMS_NOTICE";
+
+ /**
+ * 服务单自动配料
+ */
+ public static final String OPEN_SERVICE_ORDER_AUTO_BATCHING = "OPEN_SERVICE_ORDER_AUTO_BATCHING";
+
+ /**
* 赠送金额购买产品算赠送购买
*/
public static final String SHOP_MANAGE_GIFTISFREE = "shopManageGiftisfree";
@@ -588,6 +593,15 @@
*/
public static final String WX_ORDER_NOTICE_DINGDING_TOKEN = "wxOrderNoticeDingdingToken";
+ /**
+ * 系统名称
+ */
+ public static final String ADMIN_SYSTEM_TITLE = "ADMIN_SYSTEM_TITLE";
+
+ /**
+ * 品牌名称
+ */
+ public static final String ADMIN_BRAND_TITLE = "ADMIN_BRAND_TITLE";
--
Gitblit v1.9.1