From f4d4486e55b91ab2d6313c48dbe8500c3928e8fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 09:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 44 ++++++++++++++++++++------------------------
1 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
index 8f06530..44afe3f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -686,38 +686,34 @@
earnMoney = MoneyBigDecimalUtil.mul2(earnMoney, rate);
}
- String school = "鏉挎牀瀛﹂櫌";
- String platformSubsidy = "琛ヨ创杩斾剑 ";
- String teamSubsidy = "浼氬憳涓撳睘";
- String teamReward = "瓒呯骇浼氬憳涓撳睘";
-
+ String shareRate = "鍙韩浣ｉ噾鐨�<label style=\"color:#E5005C;\">%s</label>";
+ String fansRate = "鏈�楂樹剑閲戠殑<label style=\"color:#E5005C;\">%s</label>";
+ String fansIndirect = "鍥㈤槦鍒嗙孩姹�<label style=\"color:#E5005C;\">%s</label>";
+ String teamBonus = "鍥㈤槦鍒嗙孩姹�<label style=\"color:#E5005C;\">%s</label>";
// 杈句汉鐗�
JSONObject jsonrRed1 = new JSONObject();
- jsonrRed1.put("platformSubsidy", platformSubsidy + "<label style=\"color:#E5005C;\">52.5%</label>");
- jsonrRed1.put("school", school + "<label style=\"color:#E5005C;\">杈句汉鐝�</label>");
- jsonrRed1.put("teamSubsidy", teamSubsidy);
- jsonrRed1.put("teamReward", teamReward);
-
+ jsonrRed1.put("shareRate", String.format(shareRate, "152%"));
+ jsonrRed1.put("fansRate", String.format(fansRate, "22.5%"));
+ jsonrRed1.put("fansIndirect", String.format(fansIndirect, "5%"));
+ jsonrRed1.put("teamBonus", "楂樼骇浼氬憳浠ヤ笂涓撳睘");
JSONObject jsonrRed2 = new JSONObject();
- jsonrRed2.put("platformSubsidy", platformSubsidy + "<label style=\"color:#E5005C;\">60%</label>");
- jsonrRed2.put("school", school + "<label style=\"color:#E5005C;\">鏅�氱彮</label>");
- jsonrRed2.put("teamSubsidy", teamSubsidy + "鏈�楂�<label style=\"color:#E5005C;\">7.5%</label>");
- jsonrRed2.put("teamReward", teamReward);
-
+ jsonrRed2.put("shareRate", String.format(shareRate, "162.5%"));
+ jsonrRed2.put("fansRate", String.format(fansRate, "27.5%"));
+ jsonrRed2.put("fansIndirect", String.format(fansIndirect, "7.5%"));
+ jsonrRed2.put("teamBonus", "楂樼骇浼氬憳浠ヤ笂涓撳睘");
JSONObject jsonrRed3 = new JSONObject();
- jsonrRed3.put("platformSubsidy", platformSubsidy + "<label style=\"color:#E5005C;\">70%</label>");
- jsonrRed3.put("school", school + "<label style=\"color:#E5005C;\">楂樼骇鐝�</label>");
- jsonrRed3.put("teamSubsidy", teamSubsidy + "鏈�楂�<label style=\"color:#E5005C;\">15%</label>");
- jsonrRed3.put("teamReward", teamReward);
-
+ jsonrRed3.put("shareRate", String.format(shareRate, "170%"));
+ jsonrRed3.put("fansRate", String.format(fansRate, "32.5%"));
+ jsonrRed3.put("fansIndirect", String.format(fansIndirect, "10%"));
+ jsonrRed3.put("teamBonus", String.format(teamBonus, "40%"));
JSONObject jsonrRed4 = new JSONObject();
- jsonrRed4.put("platformSubsidy", platformSubsidy + "<label style=\"color:#E5005C;\">115%</label>");
- jsonrRed4.put("school", school + "<label style=\"color:#E5005C;\">瓒呯骇鐝�</label>");
- jsonrRed4.put("teamSubsidy", teamSubsidy + "鏈�楂�<label style=\"color:#E5005C;\">22.5%</label>");
- jsonrRed4.put("teamReward", teamReward + "鏈�楂�<label style=\"color:#E5005C;\">40%</label>");
+ jsonrRed4.put("shareRate", String.format(shareRate, "225%"));
+ jsonrRed4.put("fansRate", String.format(fansRate, "37.5%"));
+ jsonrRed4.put("fansIndirect", String.format(fansIndirect, "12.5%"));
+ jsonrRed4.put("teamBonus", String.format(teamBonus, "80%"));
JSONObject json = new JSONObject();
--
Gitblit v1.8.0