From bbe1a381f99d957d003f48b68dfd5bf0e401f5f0 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:27:25 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java
index eed7f9e..985e0e7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.BigDecimalUtil;
import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
@@ -26,6 +27,7 @@
import com.google.gson.stream.JsonWriter;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
+import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -51,6 +53,9 @@
@Resource
private UserInfoService userInfoService;
+
+ @Resource
+ private HongBaoV2Service hongBaoV2Service;
/**
* 鏂扮増璧勯噾璇︽儏锛�1.4.9锛�
@@ -120,7 +125,8 @@
if (value == null) {
return new JsonPrimitive("");
} else {
- return new JsonPrimitive(MoneyBigDecimalUtil.getWithNoZera(value).toString());
+ value = value.setScale(2);
+ return new JsonPrimitive(value.toString());
}
}
});
@@ -226,7 +232,7 @@
typeList.add(UserMoneyDetailTypeEnum.invite);
typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);
typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
-
+
minDate = new Date(0L);
maxDate = new Date(timeStamp);
vo.setTotalInviteMoney(
@@ -254,8 +260,34 @@
vo.setTotalShareMoney(
userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
- out.print(JsonUtil.loadTrueResult(gson.toJson(vo)));
+
+ minDate = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(timeStamp, "yyyy-MM"), "yyyy-MM"));
+ Calendar ca = Calendar.getInstance();
+ ca.setTime(new Date(timeStamp));
+ ca.add(Calendar.MONTH, 1);
+ maxDate = new Date(ca.getTimeInMillis());
+
+ // 鏈湀鏈埌璐�
+ vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate));
+
+ // 鍏ㄩ儴鏈埌璐�
+ minDate = new Date(0);
+ vo.setTotalUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate));
+ 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());
+ }
+ }
+ });
+
+ out.print(JsonUtil.loadTrueResult(builder.create().toJson(vo)));
}
}
--
Gitblit v1.8.0