From c8b031a405ebd2b450f5098bb37e5e63390f364c Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 18 Jul 2025 09:57:31 +0800
Subject: [PATCH] 新增贷款，优化
---
src/main/java/com/nq/controller/echo/EChoController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nq/controller/echo/EChoController.java b/src/main/java/com/nq/controller/echo/EChoController.java
index 8db1b85..4129003 100644
--- a/src/main/java/com/nq/controller/echo/EChoController.java
+++ b/src/main/java/com/nq/controller/echo/EChoController.java
@@ -2,8 +2,14 @@
import com.nq.common.ServerResponse;
import com.nq.dao.EChoMapper;
+import com.nq.dao.UserAssetsMapper;
+import com.nq.enums.EStockType;
import com.nq.pojo.EChoBean;
+import com.nq.pojo.User;
+import com.nq.pojo.UserAssets;
import com.nq.service.IEchoServices;
+import com.nq.service.IUserService;
+import com.nq.service.impl.UserAssetsServices;
import com.nq.utils.translate.GoogleTranslateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -13,6 +19,8 @@
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.BigInteger;
/**
* 利息报接口
@@ -27,6 +35,12 @@
@Autowired
EChoMapper eChoMapper;
+ @Autowired
+ UserAssetsServices userAssetsServices;
+
+ @Autowired
+ IUserService iUserService;
+
@PostMapping("queryEcho.do")
@ResponseBody
public ServerResponse queryEcho() {
@@ -36,16 +50,27 @@
@PostMapping("buyEcho.do")
@ResponseBody
- public ServerResponse buyEcho(@RequestParam("eId") String eid, @RequestParam("money") Integer money, HttpServletRequest request) {
+ public ServerResponse buyEcho(@RequestParam("eId") String eid, @RequestParam("money") BigDecimal money, HttpServletRequest request) {
+ if(null == money || money.compareTo(BigDecimal.ZERO) <= 0){
+ return ServerResponse.createByErrorMsg("金额不能小于0",request);
+ }
EChoBean eChoBean = eChoMapper.selectById(Integer.parseInt(eid));
if (eChoBean == null) {
return ServerResponse.createByErrorMsg("基金产品不存在",request);
} else {
- if (null != eChoBean.getBuyLowestNum() && money < eChoBean.getBuyLowestNum()) {
+ if (null != eChoBean.getBuyLowestNum() && money.compareTo(new BigDecimal(eChoBean.getBuyLowestNum())) < 0) {
return ServerResponse.createByErrorMsg("购买失败，最低购买数量："+eChoBean.getBuyLowestNum(),request);
}
}
- if (iEchoServices.buyECho(eid, money,request)) {
+ User user = this.iUserService.getCurrentRefreshUser(request);
+ UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId(EStockType.MX.getCode(), user.getId());
+ if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
+ }
+ if(userAssets.getAvailableBalance().compareTo(money) < 0){
+ return ServerResponse.createByErrorMsg("配资不足",request);
+ }
+ if (iEchoServices.buyECho(eid, money, userAssets.getAccectType(), request)) {
return ServerResponse.createBySuccess("购买成功",request);
} else {
return ServerResponse.createByErrorMsg("购买失败",request);
--
Gitblit v1.9.3