From 2f2860b50f24e5e3598d223db03d43df61d95c97 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 13 三月 2020 16:31:30 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/account/UserUtil.java | 15 ++++++++++++---
1 files changed, 12 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..5b1ccc5 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,13 @@
return account;
}
+ 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