From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距,和收银人 6.	PC端服务单新增划扣金额展示

---
 zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 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 538ffde..ff36166 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
@@ -13,6 +13,7 @@
     public static final String ZONGDIAN = "总店";
 
 
+
     private AppConstance() {
     }
 
@@ -520,7 +521,7 @@
     /**
      * 免免邮金额
      */
-    public static final String FREE_PACKAGE_PRICE = "FREE_PACKAGE_PRICE";
+        public static final String FREE_PACKAGE_PRICE = "FREE_PACKAGE_PRICE";
 
 
     /**
@@ -550,6 +551,12 @@
      */
     public static final String WECHARPAY_NOTIFYURL = "wecharPaynotifyUrl";
     /**
+     * 充值支付通知地址
+     */
+    public static final String WECHARPAY_RECHARGE_NOTIFYURL = "wecharpayRechargeNotifyurl";
+
+
+    /**
      * 支付证书地址
      */
     public static final String WECHARPAY_CERTLOCAL_PATH = "certLocalPath";
@@ -566,10 +573,20 @@
     public static final String WAREHOUSE_MANAGE_STOCK = "WAREHOUSE_MANAGE_STOCK";
 
 
+    /**
+     * 家居产品销售是否生成消耗业绩
+     */
+    public static final String SHOP_MANAGE_JJCPAS_CONSUME = "shopManageJjcpasConsume";
 
+    /**
+     * 赠送金额购买产品算赠送购买
+     */
+    public static final String SHOP_MANAGE_GIFTISFREE = "shopManageGiftisfree";
 
-
-
+    /**
+     * 钉钉通知token
+     */
+    public static final String WX_ORDER_NOTICE_DINGDING_TOKEN = "wxOrderNoticeDingdingToken";
 
 
 

--
Gitblit v1.9.1