From 8cc3c660bdaaaa6a46eecadb78e4e9c17a07c227 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 五月 2022 18:57:06 +0800
Subject: [PATCH] bug修复
---
app/src/main/java/com/yeshi/makemoney/app/controller/client/api/ExtractController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/ExtractController.java b/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/ExtractController.java
index 68fb888..11d9582 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/ExtractController.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/ExtractController.java
@@ -16,6 +16,7 @@
import com.yeshi.makemoney.app.service.inter.money.ExtractService;
import com.yeshi.makemoney.app.service.inter.money.UserExtractMoneyLimitService;
import com.yeshi.makemoney.app.service.inter.money.UserMoneyService;
+import com.yeshi.makemoney.app.service.inter.user.UserInfoService;
import com.yeshi.makemoney.app.service.inter.user.WXUserInfoService;
import com.yeshi.makemoney.app.utils.ApiCodeConstant;
import com.yeshi.makemoney.app.utils.Constant;
@@ -59,9 +60,12 @@
private ExtractService extractService;
@Resource
+ private UserInfoService userInfoService;
+
+ @Resource
private UserExtractMoneyLimitService userExtractMoneyLimitService;
- private Gson gson = JsonUtil.getConvertBigDecimalToStringBuilder(new GsonBuilder()).create();
+ private Gson gson = JsonUtil.getConvertBigDecimalToStringBuilder(new GsonBuilder()).create();
/**
* @return java.lang.String
@@ -74,13 +78,14 @@
@RequestMapping("getExtractInfo")
@ResponseBody
public String getExtractInfo(AcceptData acceptData, Long uid) {
+ UserInfo user = userInfoService.get(uid);
ExtractInfoVO vo = new ExtractInfoVO();
vo.setBalance(userMoneyService.getBalance(uid).setScale(2));
BigDecimal extracting = extractService.getExtractingMoney(uid);
if (extracting.compareTo(new BigDecimal(0)) > 0) {
vo.setExtracting(extracting.setScale(2).toString());
}
- vo.setNeedBindWX(wxUserInfoService.selectByUid(uid) == null);
+ vo.setNeedBindWX(user.getWxUser() == null);
return JsonUtil.loadTrueResult(gson.toJson(vo));
}
@@ -123,11 +128,17 @@
@RequestMapping("extract")
@ResponseBody
public String extract(AcceptData acceptData, Long uid, BigDecimal money, HttpServletRequest request) {
- WXUserInfo wxUserInfo = wxUserInfoService.selectByUid(uid);
- if (wxUserInfo == null) {
+ UserInfo user = userInfoService.get(uid);
+
+ if (user.getWxUser() == null) {
return JsonUtil.loadFalseResult("灏氭湭缁戝畾寰俊");
}
+ WXUserInfo wxUserInfo = wxUserInfoService.get(user.getWxUser().getId());
+ if (wxUserInfo == null) {
+ return JsonUtil.loadFalseResult("璇烽噸鏂扮粦瀹氬井淇�");
+ }
+
Extract extract = new Extract();
extract.setUser(new UserInfo(uid));
extract.setIp(IPUtil.getRemotIP(request) + ":" + request.getRemotePort());
--
Gitblit v1.8.0