From 4c4646819beb205c070c34737c0b94d7084d548f Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.1.106>
Date: 星期二, 03 三月 2020 13:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 110 insertions(+), 3 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 bc5aad2..309a32f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -1,11 +1,14 @@
package com.yeshi.fanli.util;
+import java.math.BigDecimal;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
import org.yeshi.utils.annotation.MapUtil;
+import org.yeshi.utils.entity.wx.WXAPPInfo;
+import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.config.AlipayConfig;
import com.yeshi.fanli.entity.config.ConstantConfig;
import com.yeshi.fanli.entity.config.SMSConfig;
@@ -22,6 +25,8 @@
public static boolean IS_TEST = true;
public static int PAGE_SIZE = 20;
+
+ public static String YINGYONGBAO_LINK = "https://w.url.cn/s/AHUuT7i";
public final static String UIDAESKEY = "WW782ss@8*px/%2v";
@@ -71,7 +76,6 @@
public static String Extract_Activty;
public static String HB_Activity;
- public static final String EXTRACT_MIN_MONEY = "extract_min_money";
public static final String MYLIKE = "mylike";
public static final String MYDYNAMIC = "mydynamic";
@@ -79,6 +83,9 @@
public static final String TAOBAO_AUTH_APPSECRET = "e0a2e05deabf5ce039b52e5b492d5382";
public static final String TAOBAO_RELATION_PID_DEFAULT = "mm_124933865_56750082_87140050199";
public static final String TAOBAO_SPECIAL_PID_DEFAULT = "mm_124933865_56750082_89555600043";
+
+ // 濂栧姳鍒告渶楂樻瘮渚�
+ public static final BigDecimal MAX_REWARD_RATE = new BigDecimal("0.31");
// 杩斿洖缁欏鎴风鐨勮处鍙峰皝绂佹彁绀鸿
public static final String FORBIDDEN_USER_REASON_DESC = "浣犵殑璐﹀彿鎴栫粦瀹氱殑绗笁鏂硅处鍙峰凡琚皝绂侊紝灏佺鍘熷洜鍙湪甯姪涓績鐨勭浉鍏宠鍒欎腑鍙傜湅锛屽鏈夌枒闂垨鐢宠瘔瑙ｉ櫎灏佺璇疯仈绯诲鏈�";
@@ -92,6 +99,12 @@
public static final int SOURCE_TYPE_JD = 2;
// 鏉ユ簮-鎷煎澶�
public static final int SOURCE_TYPE_PDD = 3;
+ // 鏉ユ簮-鍞搧浼�
+ public static final int SOURCE_TYPE_WPH = 4;
+ // 鏉ユ簮-鑻忓畞
+ public static final int SOURCE_TYPE_SUNING = 5;
+ // 鏉ユ簮-楗夸簡涔�
+ public static final int SOURCE_TYPE_ELME = 6;
// 鑷喘-杩斿埄
public static final int TYPE_REBATE = 1;
@@ -99,11 +112,74 @@
public static final int TYPE_SHAER = 2;
// 閭�璇�
public static final int TYPE_INVITE = 3;
-
+
// 鍙ｄ护鏈夋晥鏈�-澶�
public static final int TOKEN_DAYS = 1;
// 璧犻�佹湁鏁堟湡-澶�
public static final int GIVE_DAYS = 1;
+ // 閲戝竵鏈夋晥澶╂暟
+ public static final int GOLD_COIN_VALID_DAYS = 30;
+
+ // 寰俊鑷姩鎻愮幇閲戦
+ public static final int AUTO_EXTRACT_MONEY = 1;
+ // 寰俊鑷姩鎻愮幇鏈�浣庝綑棰�
+ public static final int AUTO_EXTRACT_MIN_SURPLUS = 2;
+
+ // vip銆佺孩鍖呫�佸鍔卞埜鍊掕鏃� 2.1涓婄嚎鏃堕棿
+ public static final String VIP_ONLINE_TIME = "2019-12-22";
+
+ // 绾㈠寘閭�璇峰鍔�
+ public static final String RED_PACK_ONLINE_TIME = "2019-12-14";
+
+ // 涓�闃舵锛�20澶╂暟闄愬埗
+ public static final int ONE_STAGE_LIMIT_DAYS = 20;
+ // 涓�闃舵锛氱珛寰楃幇閲�3鍏�
+ public static final BigDecimal ONE_STAGE_MONEY = new BigDecimal("3");
+
+ // 浜岄樁娈碉細90澶╂暟闄愬埗
+ public static final int TWO_STAGE_LIMIT_DAYS = 90;
+ // 浜岄樁娈碉細-闃熷弸浜х敓鐨勮鍗曚腑锛堣嚜璐�+鍒嗕韩锛夛紝閭�璇蜂汉绱浜х敓鈮�1 鍏冨閲�
+ public static final BigDecimal TWO_STAGE_ORDER_REWARD_MIN = new BigDecimal("1");
+ // 浜岄樁娈碉細 绾㈠寘閲戦鏈�灏�3鍏�
+ public static final BigDecimal TWO_STAGE_MONEY_MIN = new BigDecimal("3");
+ // 浜岄樁娈碉細姣忔鏈�澶氬鍔�0.5
+ public static final BigDecimal TWO_STAGE_MONEY_ADD = new BigDecimal("0.5");
+ // 浜岄樁娈碉細 澧炲姞9娆�
+ public static final int TWO_STAGE_MONEY_ADD_NUM = 9;
+
+ // 涓夐樁娈碉細杩炵画濂栧姳鏈堟暟
+ public static final int THREE_STAGE_REWARD_MONTH = 15;
+ // 涓夐樁娈碉細-杩炵画 15 涓湀濂藉弸姣忔湀鈥滅粰浣犵疮璁′骇鐢熲墺2 鍏冨 閲戔��
+ public static final BigDecimal THREE_STAGE_ORDER_REWARD_MIN = new BigDecimal("2");
+ // 涓夐樁娈碉細绾㈠寘濂栧姳闅忔満鑼冨洿
+ public static final double THREE_STAGE_RANDOM_MIN = 1.5;
+ public static final double THREE_STAGE_RANDOM_MAX = 2;
+
+ // 鏂颁汉濂栧姳杩炵画澶╂暟
+ public static final long TLJ_NEW_USER_DAYS = 7;
+ // 鏂颁汉濂栧姳鏈�楂�
+ public static final BigDecimal TLJ_NEW_USER_MONEY = new BigDecimal("2");
+ // 鏂颁汉濂栧姳绗竴娆￠殢鏈烘渶灏�
+ public static final int TLJ_NEW_USER_MIN = 50;
+ // 鏂颁汉濂栧姳绗竴娆￠殢鏈烘渶澶�
+ public static final int TLJ_NEW_USER_MAX = 60;
+ // 鏂颁汉绾㈠寘鏈夋晥鏈�10澶�
+ public static final int TLJ_NEW_USER_LIMIT = 10;
+ // 鏂颁汉瀹氫箟锛� 鑷畬鎴愭敞鍐岃捣10澶╁唴锛�
+ public static final int TLJ_NEW_USER_DEFINE = 10;
+
+ // vip濂栧姳鍒稿埜5寮�
+ public static final int VIP_COUPON_REWARD_NUM = 30;
+ // vip璧犻�佸厤鍗曞埜5寮�
+ public static final int VIP_COUPON_GIVEFREE_NUM = 5;
+ // vip璧犻�侀噾甯�
+ public static final int VIP_COLDCOIN_NUM = 1800;
+
+ // 濂栧姳鍒稿�掕鏃� - 澶╂暟
+ public static final int COUPON_REWARD_LIMIT_DAY = 5;
+
+ // 涓撳睘閭�璇风爜鐢宠鐩存帴绮変笣闄愬埗
+ public static final int INVITE_CODRE_TAILOR_LIMIT = 2;
public static WXGZConfig wxGZConfig;
@@ -159,7 +235,7 @@
*/
public static final String BINDUSER = "2";
/**
- * 杩斿埄鍒哥郴缁熺殑ID锛堝畨鍗擄級
+ * 绯荤粺鐨処D锛堝畨鍗擄級
*/
public static final long FANLI = 4;
/**
@@ -168,7 +244,15 @@
public static final String WXHEADURL = "wx/headImg/";
public static final String WEBPAGE_SIGN_KEY = "@?,223Hbb88lll";
+
+ public static final String WXMP_SIGN_KEY="xyJBaNliK&*!uAIShEn8g@@";
+
+ public static final String WXMP_USER_SIGN_KEY="xyJBaNliShEn8g@@";
+
+ public static final WXAPPInfo WXMP_APP_INFO=new WXAPPInfo("wxc22f3bd53cb25012", "4c7b166fecb6d9f53837e993f2214673", "", "");
+
+
// 鏂颁汉鎶藉-鏈�澶ф鏁�
public static final int MAX_COUNT_LOTTERY_NEWBIES = 5;
@@ -235,6 +319,12 @@
return "浜笢";
case SOURCE_TYPE_PDD:
return "鎷煎澶�";
+ case SOURCE_TYPE_WPH:
+ return "鍞搧浼�";
+ case SOURCE_TYPE_SUNING:
+ return "鑻忓畞";
+ case SOURCE_TYPE_ELME:
+ return "楗夸簡涔�";
default:// 鍏朵粬绫诲瀷
return "";
}
@@ -245,7 +335,24 @@
return 1;
else if ("ios".equalsIgnoreCase(platform))
return 2;
+ else if ("wxmp".equalsIgnoreCase(platform))
+ return 4;
else
return 0;// 鏈煡
}
+
+ public static String getAppName(String platform, String version) {
+ // if (VersionUtil.greaterThan_2_0(platform, version))
+ return Constant.systemCommonConfig.getProjectChineseName();
+ // else
+ // return "杩斿埄鍒�";
+ }
+
+ public static WXAccountInfoDTO getWXAccount(String platform, String version) {
+ // return new WXAccountInfoDTO("wx43617e2ed82c5b28",
+ // "f8a65908fb4681bdd181de70f6ab9a3b", "wx5c0d167c6e3ad726",
+ // "0c79d5869bb0f2d7c13e43f9a18f440d");
+ return new WXAccountInfoDTO("wxa99686bb65a9f466", "57390718ddedaa1591f6876cdcf96f43", "wx5c0d167c6e3ad726",
+ "0c79d5869bb0f2d7c13e43f9a18f440d");
+ }
}
--
Gitblit v1.8.0