From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/util/account/UserUtil.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/account/UserUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/account/UserUtil.java
index 17d199b..8a8afb1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/account/UserUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/account/UserUtil.java
@@ -75,9 +75,9 @@
+ "/client/threeShareNew?uid=" + uid + "&_=" + java.lang.System.currentTimeMillis());
}
- public static String getInviteCode(Long uid) {
+ public static String getInviteCode(int base, Long uid) {
- long num = 1000000000L + uid;
+ long num = base * 100000000L + uid;
return convert10To36(num);
}
@@ -134,7 +134,7 @@
name = dest.getName().charAt(0) + "*";
dest.setName(name);
- String account =filterAlipayAccount(dest.getAccount());
+ String account = filterAlipayAccount(dest.getAccount());
dest.setAccount(account);
}
@@ -179,4 +179,24 @@
return account;
}
+ public static String filterAlipayName(String name) {
+ String st = "";
+ for (int i = 0; i < name.length(); i++) {
+ if (i == 0)
+ st += name.charAt(i);
+ else
+ st += "*";
+ }
+ return st;
+ }
+
+ public static String filterOrderId(String orderId) {
+ if (orderId == null || orderId.length() <= 6)
+ return orderId;
+ if (orderId.length() <= 16) {// 闅愯棌2浣�
+ return orderId.substring(0, orderId.length() - 2) + "**";
+ } else {// 闅愯棌6浣�
+ return orderId.substring(0, orderId.length() - 6) + "******";
+ }
+ }
}
--
Gitblit v1.8.0