From 6530bfce2719a521eb81fd86b7490a5b83e1067b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 11 五月 2020 10:06:22 +0800
Subject: [PATCH] 提现记录列表
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java
index d4971f1..d4d3e00 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java
@@ -36,10 +36,12 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.money.IncomeDetailVO;
import com.yeshi.fanli.vo.money.MoneyPredictVO;
import com.yeshi.fanli.vo.money.MoneyStatisticVO;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
/**
@@ -373,31 +375,26 @@
list = new ArrayList<>();
}
-
+ JSONArray JSONArray = new JSONArray();
for (Extract extract: list) {
+ Date receiveTime = extract.getReceiveTime();
+ if (receiveTime == null) {
+ receiveTime = new Date(extract.getExtractTime());
+ }
+ String account = "鏀粯瀹濓細" + UserUtil.filterAlipayAccount(extract.getAccount());
+ account = account + "-濮撳悕锛�"+ UserUtil.filterAlipayName(extract.getName());
+ JSONObject object = new JSONObject();
+ object.put("title", "浣犱簬"+ TimeUtil.formatDate(receiveTime) +"鎻愮幇鎴愬姛");
+ object.put("account", account);
+ object.put("money","楼" + extract.getMoney().setScale(2).toString());
+ JSONArray.add(object);
}
-
-
- GsonBuilder builder = new GsonBuilder();
- builder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {
- @Override
- public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {
- if (value == null) {
- return new JsonPrimitive("");
- } else {
- // 淇濈暀2浣嶅皬鏁�
- value = value.setScale(2);
- return new JsonPrimitive(value.toString());
- }
- }
- });
-
- JSONObject object = new JSONObject();
- object.put("count", list.size());
- object.put("list", builder.create().toJson(list));
- out.print(JsonUtil.loadTrueResult(object));
+ JSONObject json = new JSONObject();
+ json.put("count", extractService.countExtractSucceedRecord(uid));
+ json.put("list", JSONArray);
+ out.print(JsonUtil.loadTrueResult(json));
}
--
Gitblit v1.8.0