From 2db0485ab8aa814499adf49112c5aa9e4c9e78b2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 08 九月 2019 15:51:25 +0800
Subject: [PATCH] 自动提现处理
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 066855e..ff64900 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
@@ -13,7 +13,6 @@
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,11 +25,14 @@
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import com.yeshi.fanli.entity.accept.AcceptData;
+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.service.inter.hongbao.HongBaoV2Service;
+import com.yeshi.fanli.service.inter.user.ExtractService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;
@@ -56,6 +58,12 @@
@Resource
private HongBaoV2Service hongBaoV2Service;
+
+ @Resource
+ private ExtractService extractService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
/**
* 鏂扮増璧勯噾璇︽儏锛�1.4.9锛�
@@ -152,8 +160,9 @@
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
+ UserInfo user = userInfoService.getUserById(uid);
- BigDecimal balance = userInfoService.getUserById(uid).getMyHongBao();
+ BigDecimal balance = user.getMyHongBao();
UserMoneyStatisticVO vo = new UserMoneyStatisticVO();
vo.setBalanceMoney(balance);
@@ -273,7 +282,7 @@
// 鍏ㄩ儴鏈埌璐�
minDate = new Date(0);
- maxDate=new Date(timeStamp);
+ maxDate = new Date(timeStamp);
vo.setTotalUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate));
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {
@@ -289,6 +298,23 @@
}
});
+ // 鑾峰彇鎻愮幇涓殑淇℃伅
+
+ BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
+ if (extractingMoney.compareTo(new BigDecimal(0)) > 0)
+ vo.setExtractingMoneyInfo("鎻愮幇涓�:楼" + extractingMoney.setScale(2));
+ // 鑾峰彇鏄惁缁戝畾浜嗗井淇�
+ if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) {
+ vo.setBindingWX(true);
+ } else
+ vo.setBindingWX(false);
+
+ UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
+ if (extra != null && extra.getAutoExtract() != null && extra.getAutoExtract() == true)
+ vo.setAutoExtract(true);
+ else
+ vo.setAutoExtract(false);
+
out.print(JsonUtil.loadTrueResult(builder.create().toJson(vo)));
}
--
Gitblit v1.8.0