From d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 19 十二月 2018 17:28:19 +0800
Subject: [PATCH] Merge branch 'master' into dev-moneydetail
---
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
index 5fca61e..51ce1e6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
@@ -239,13 +239,18 @@
JSONObject contentJson1 = new JSONObject();
contentJson1.put("color", fontColor1);
contentJson1.put("content", "棰勪及鍒嗕韩濂栭噾:");
-
+ String shareMoney = "0";
String revenue = "楼0";
String totalGetMoney = activity.getTotalGetMoney();
if (totalGetMoney != null && totalGetMoney.trim().length() > 0) {
String[] split = totalGetMoney.split("锛�");
if (split != null) {
revenue = split[1];
+ }
+
+ String[] splitMoney = totalGetMoney.split("楼");
+ if (splitMoney != null) {
+ shareMoney = splitMoney[1];
}
}
@@ -263,6 +268,7 @@
data.put("title", title);
data.put("revenue", array);
+ data.put("fanMoney", shareMoney);
data.put("shareId", map.get("shareId"));
data.put("shareImg", map.get("loadResult"));
data.put("notifyDesc", configService.get("goods_share_multiple_notify"));
--
Gitblit v1.8.0