From b47fb09eaffa4a13c0d63e823cb9319bcb775249 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 02 四月 2020 15:22:11 +0800
Subject: [PATCH] 发圈修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
index efc889b..217959a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
@@ -4,6 +4,7 @@
import java.io.PrintWriter;
import java.lang.reflect.Type;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -28,8 +29,10 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.money.extract.ExtractService;
import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
@@ -71,6 +74,9 @@
@Resource
private ConfigService configService;
+ @Resource
+ private HongBaoV2CountService hongBaoV2CountService;
+
/**
* 鏂扮増璧勯噾璇︽儏锛�1.4.9锛�
*
@@ -82,11 +88,14 @@
* 骞翠唤
* @param month
* 鏈堜唤
+ * @param type
+ * 1-鏀跺叆 2-鏀嚭 0-鍏ㄩ儴
+ *
* @param out
*/
@RequestMapping(value = "getUserMoneyDetailList")
public void getUserMoneyDetailList(AcceptData acceptData, Long uid, Long index, Integer year, Integer month,
- PrintWriter out) {
+ Integer type, PrintWriter out) {
if (uid == null || uid == 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
@@ -107,8 +116,9 @@
date = new Date(ca.getTimeInMillis() - 1);
}
- List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, date);
- long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, date);
+ List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, type,
+ date);
+ long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, type, date);
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
gsonBuilder.registerTypeAdapter(UserMoneyDetailTypeEnum.class, new TypeAdapter<UserMoneyDetailTypeEnum>() {
@Override
@@ -284,7 +294,8 @@
TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy-MM"), "yyyy-MM"));
// 鏈湀鏈埌璐�
- vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate));
+ BigDecimal monthUnRecievedMoney = hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate);
+ vo.setMonthUnRecievedMoney(monthUnRecievedMoney);
// 鍏ㄩ儴鏈埌璐�
minDate = new Date(0);
@@ -308,7 +319,7 @@
// 鑾峰彇鎻愮幇涓殑淇℃伅
BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
if (extractingMoney.compareTo(new BigDecimal(0)) > 0)
- vo.setExtractingMoneyInfo("鎻愮幇涓�:楼" + extractingMoney.setScale(2));
+ vo.setExtractingMoneyInfo("鎻愮幇涓�:楼" + extractingMoney.setScale(2, RoundingMode.HALF_UP));
// 鑾峰彇鏄惁缁戝畾浜嗗井淇�
if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) {
vo.setBindingWX(true);
@@ -334,7 +345,7 @@
else
vo.setAutoExtract(false);
- vo.setAutoExtractHelpUrl(configService.get("auto_extract_help_url"));
+ vo.setAutoExtractHelpUrl(configService.get(ConfigKeyEnum.autoExtractHelpUrl.getKey()));
vo.setOpenAutoExtractMsg("鑷姩鎻愮幇蹇呴』瑕佸井淇℃巿鏉冿紝褰撹处鎴蜂腑鐨勪綑棰濃墺2鍏冩椂锛岀郴缁熷湪淇濋殰浣犺祫閲戝畨鍏ㄧ殑鎯呭喌涓嬶紝浠ュ井淇＄孩鍖呯殑褰㈠紡瀹屾垚鎻愮幇");
vo.setCloseAutoExtractMsg("鍏抽棴鑷姩鎻愮幇鍚庯紝60澶╀互鍐呭皢涓嶈嚜鍔ㄦ彁鐜帮紝60澶╁悗绯荤粺灏嗕細鑷姩寮�鍚紝鏁鐭ユ檽");
}
@@ -393,6 +404,7 @@
UserInfoExtra update = new UserInfoExtra();
update.setId(userExtra.getId());
update.setAutoExtract(false);
+ update.setCloseTimeExtract(new Date());
try {
userInfoExtraService.saveUserInfoExtra(update);
} catch (UserInfoExtraException e) {
--
Gitblit v1.8.0