From 7e4a23688ff82fbecccb9f7fa8aa1d67eade58cd Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:38:48 +0800
Subject: [PATCH] 免单券激活条件：3个不同订单号-自购
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
index 2105715..8153317 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -113,6 +113,12 @@
public static final int TOKEN_DAYS = 1;
// 璧犻�佹湁鏁堟湡-澶�
public static final int GIVE_DAYS = 1;
+
+
+ // 寰俊鑷姩鎻愮幇閲戦
+ public static final int AUTO_EXTRACT_MONEY = 1;
+ // 寰俊鑷姩鎻愮幇鏈�浣庝綑棰�
+ public static final int AUTO_EXTRACT_MIN_SURPLUS = 2;
public static WXGZConfig wxGZConfig;
@@ -263,19 +269,17 @@
}
public static String getAppName(String platform, String version) {
- if (VersionUtil.greaterThan_2_0(platform, version))
- return Constant.systemCommonConfig.getProjectChineseName();
- else
- return "杩斿埄鍒�";
+ // if (VersionUtil.greaterThan_2_0(platform, version))
+ return Constant.systemCommonConfig.getProjectChineseName();
+ // else
+ // return "杩斿埄鍒�";
}
public static WXAccountInfoDTO getWXAccount(String platform, String version) {
-// if (VersionUtil.greaterThan_2_0(platform, version)) {
-// return new WXAccountInfoDTO("wxa99686bb65a9f466", "57390718ddedaa1591f6876cdcf96f43", "wx879fb78463222cd5",
-// "2ad8ec333a9f96b13c5c5c1c2b13cd67");
-// } else {
- return new WXAccountInfoDTO("wx43617e2ed82c5b28", "f8a65908fb4681bdd181de70f6ab9a3b", "wx5c0d167c6e3ad726",
- "0c79d5869bb0f2d7c13e43f9a18f440d");
-// }
+ // return new WXAccountInfoDTO("wx43617e2ed82c5b28",
+ // "f8a65908fb4681bdd181de70f6ab9a3b", "wx5c0d167c6e3ad726",
+ // "0c79d5869bb0f2d7c13e43f9a18f440d");
+ return new WXAccountInfoDTO("wxa99686bb65a9f466", "57390718ddedaa1591f6876cdcf96f43", "wx5c0d167c6e3ad726",
+ "0c79d5869bb0f2d7c13e43f9a18f440d");
}
}
--
Gitblit v1.8.0