From 7970aa86847282b6c0ddec446f6a003f9b97b451 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期三, 04 三月 2020 14:04:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index d267f6b..0592d5a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -70,6 +70,7 @@
 import com.yeshi.fanli.vo.goods.GoodsDetailVO;
 import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
 
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 /**
@@ -669,10 +670,28 @@
 			});
 			Gson gson = gsonBuilder.create();
 			long count = goodsEvaluateService.countValidMaterials(type);
-
+			
+			String listStr = gson.toJson(list);
+			JSONArray array = JSONArray.fromObject(listStr);
+			for (int i = 0; i< array.size() ; i++) {
+				Object object = array.get(i);
+				JSONObject json = JSONObject.fromObject(object);
+				Object shareNum = json.get("shareNum");
+				if (shareNum != null) {
+					int num = Integer.parseInt(shareNum.toString());
+					if (num >= 10000) {
+						double sales = num;
+						String salesCountMidea = String.format("%.1f", sales / 10000);
+						json.put("shareNum", salesCountMidea + "涓�");
+					} 
+				}
+//				array.add(json);
+			}
+			
+			
 			JSONObject data = new JSONObject();
 			data.put("count", count);
-			data.put("list", gson.toJson(list));
+			data.put("list", array);
 			out.print(JsonUtil.loadTrueResult(data));
 		} catch (Exception e) {
 			e.printStackTrace();

--
Gitblit v1.8.0