From d3a9feeeee6f70462d12e48db5fd1cab9b183bc8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 17 九月 2019 17:14:54 +0800
Subject: [PATCH] 更改goodsType
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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..2105715 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,13 @@
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 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;
@@ -80,6 +82,9 @@
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.35");
+
// 杩斿洖缁欏鎴风鐨勮处鍙峰皝绂佹彁绀鸿
public static final String FORBIDDEN_USER_REASON_DESC = "浣犵殑璐﹀彿鎴栫粦瀹氱殑绗笁鏂硅处鍙峰凡琚皝绂侊紝灏佺鍘熷洜鍙湪甯姪涓績鐨勭浉鍏宠鍒欎腑鍙傜湅锛屽鏈夌枒闂垨鐢宠瘔瑙ｉ櫎灏佺璇疯仈绯诲鏈�";
@@ -92,6 +97,10 @@
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 TYPE_REBATE = 1;
@@ -99,7 +108,7 @@
public static final int TYPE_SHAER = 2;
// 閭�璇�
public static final int TYPE_INVITE = 3;
-
+
// 鍙ｄ护鏈夋晥鏈�-澶�
public static final int TOKEN_DAYS = 1;
// 璧犻�佹湁鏁堟湡-澶�
@@ -159,7 +168,7 @@
*/
public static final String BINDUSER = "2";
/**
- * 杩斿埄鍒哥郴缁熺殑ID锛堝畨鍗擄級
+ * 绯荤粺鐨処D锛堝畨鍗擄級
*/
public static final long FANLI = 4;
/**
@@ -235,6 +244,10 @@
return "浜笢";
case SOURCE_TYPE_PDD:
return "鎷煎澶�";
+ case SOURCE_TYPE_WPH:
+ return "鍞搧浼�";
+ case SOURCE_TYPE_SUNING:
+ return "鑻忓畞";
default:// 鍏朵粬绫诲瀷
return "";
}
@@ -248,4 +261,21 @@
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) {
+// if (VersionUtil.greaterThan_2_0(platform, version)) {
+// return new WXAccountInfoDTO("wxa99686bb65a9f466", "57390718ddedaa1591f6876cdcf96f43", "wx879fb78463222cd5",
+// "2ad8ec333a9f96b13c5c5c1c2b13cd67");
+// } else {
+ return new WXAccountInfoDTO("wx43617e2ed82c5b28", "f8a65908fb4681bdd181de70f6ab9a3b", "wx5c0d167c6e3ad726",
+ "0c79d5869bb0f2d7c13e43f9a18f440d");
+// }
+ }
}
--
Gitblit v1.8.0