From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java | 117 +++++++++++++++++++++++-----------------------------------
1 files changed, 46 insertions(+), 71 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 0c0ac3c..fcd90d7 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
@@ -12,6 +12,8 @@
public static final String WX_ORDER_FLAG = "微商城同步订单";
public static final String ZONGDIAN = "总店";
+
+
private AppConstance() {
}
@@ -262,41 +264,11 @@
// =====================================订单包裹相关
- /**
- * 省内包裹
- */
- public static final String IN_PROVINCE_PACKAGE = "IN_PROVINCE_PACKAGE";
- /**
- * 外省包裹
- */
- public static final String OUT_PROVINCE_PACKAGE = "OUT_PROVINCE_PACKAGE";
- /**
- * 省内免邮费包裹
- */
- public static final String PROVINCE_OVER_FREE_PACKAGE = "PROVINCE_OVER_FREE_PACKAGE";
// =====================================订单短信提醒相关
- /**
- * 短信提醒
- */
- public static final String MSG_ALERT = "MSG_ALERT";
- /**
- * 短信提醒号码（多个以",分割"）
- */
- public static final String MSG_ALERT_MOBILE = "MSG_ALERT_MOBILE";
-
- /**
- * 短信提醒内容
- */
- public static final String MSG_ALERT_CONTENT = "MSG_ALERT_CONTENT";
-
- /**
- * 商户余额不足短信提醒内容
- */
- public static final String MSG_ALERT_NSF = "MSG_ALERT_NSF";
/**
* 待开票
@@ -542,51 +514,14 @@
public static final String REFUND_FAIL_NOTENOUGH = "NOTENOUGH";
- // =====================================分销相关
/**
- * 成为分销商最低额度（查询数据字典时使用）
+ * 运费
*/
- public static final String BECOMING_DISTRIBUTOR_CONDITION = "BECOMING_DISTRIBUTOR_CONDITION";
-
+ public static final String PACKAGE_PRICE = "PACKAGE_PRICE";
/**
- * 用户等级-分销商
+ * 免免邮金额
*/
- public static final Integer USER_VIP_DISTRIBUTOR = 1;
-
- /**
- * 积分业务类型-获得
- */
- public static final Integer SCORE_BUSINESS_TYPE_GET = 1;
-
- /**
- * 积分业务类型-兑换
- */
- public static final Integer SCORE_BUSINESS_TYPE_EXCHANGE = 2;
-
- /**
- * 免费配送距离
- */
- public static final String DELIVERY_DISTANCE = "delivery_distance";
- /**
- * 支持学校列表
- */
- public static final String SCHOOL = "SCHOOL";
-
-
- /**
- * 省运费关系
- */
- public static final String IN_PROVINCE_PACKAGE_PRICE = "IN_PROVINCE_PACKAGE_PRICE";
- public static final String FIRST_OUT_PROVINCE_PACKAGE_PRICE = "FIRST_OUT_PROVINCE_PACKAGE_PRICE";
- public static final String SECOND_OUT_PROVINCE_PACKAGE_PRICE = "SECOND_OUT_PROVINCE_PACKAGE_PRICE";
-
- public static final String IN_PROVINCE_PACKAGE_LIST = "IN_PROVINCE_PACKAGE_LIST";
- public static final String FIRST_PROVINCE_PACKAGE_LIST = "FIRST_PROVINCE_PACKAGE_LIST";
- public static final String SECOND_PROVINCE_PACKAGE_LIST = "SECOND_PROVINCE_PACKAGE_LIST";
- /**
- * 起送费
- */
- public static final String QSFY = "QSFY";
+ public static final String FREE_PACKAGE_PRICE = "FREE_PACKAGE_PRICE";
/**
@@ -602,6 +537,46 @@
*/
public static final String GZH_APPID = "gzhAppId";
+ /**
+ * 微信商户号
+ */
+ public static final String WECHARPAY_MCHID = "wecharPayMchId";
+ /**
+ * 支付秘钥
+ */
+ public static final String WECHARPAY_SECRET = "wecharPaySecret";
+
+ /**
+ * 支付通知地址
+ */
+ public static final String WECHARPAY_NOTIFYURL = "wecharPaynotifyUrl";
+ /**
+ * 充值支付通知地址
+ */
+ public static final String WECHARPAY_RECHARGE_NOTIFYURL = "wecharpayRechargeNotifyurl";
+
+
+ /**
+ * 支付证书地址
+ */
+ public static final String WECHARPAY_CERTLOCAL_PATH = "certLocalPath";
+
+ /**
+ * APP管理模块Banner
+ */
+ public static final String APP_BANNER_GL = "APP_BANNER_GL";
+
+
+ /**
+ * 是否管理产品库存
+ */
+ public static final String WAREHOUSE_MANAGE_STOCK = "WAREHOUSE_MANAGE_STOCK";
+
+
+ /**
+ * 家居产品销售是否生成消耗业绩
+ */
+ public static final String SHOP_MANAGE_JJCPAS_CONSUME = "shopManageJjcpasConsume";
--
Gitblit v1.9.1