From 3a1977e8cc0c5fffbc6490f220f30116af6cce86 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 14 Jan 2026 15:17:07 +0800
Subject: [PATCH] 获取盘前交易列表

---
 src/main/java/com/nq/controller/echo/EChoController.java |   50 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 43 insertions(+), 7 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..17dbdc7 100644
--- a/src/main/java/com/nq/controller/echo/EChoController.java
+++ b/src/main/java/com/nq/controller/echo/EChoController.java
@@ -2,9 +2,13 @@
 
 import com.nq.common.ServerResponse;
 import com.nq.dao.EChoMapper;
+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.utils.translate.GoogleTranslateUtil;
+import com.nq.service.IUserService;
+import com.nq.service.impl.UserAssetsServices;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,6 +17,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 
 /**
  * 利息报接口
@@ -27,28 +32,53 @@
     @Autowired
     EChoMapper eChoMapper;
 
+    @Autowired
+    UserAssetsServices userAssetsServices;
+
+    @Autowired
+    IUserService iUserService;
+
     @PostMapping("queryEcho.do")
     @ResponseBody
     public ServerResponse queryEcho() {
         return ServerResponse.createBySuccess(iEchoServices.queryList());
     }
 
+    @PostMapping("queryEchoPage.do")
+    @ResponseBody
+    public ServerResponse queryEchoPage(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
+                                         HttpServletRequest request) {
+        return iEchoServices.queryListPage(pageNum, pageSize);
+    }
+
 
     @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)) {
-            return ServerResponse.createBySuccess("购买成功",request);
+        User user = this.iUserService.getCurrentRefreshUser(request);
+        UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId(EStockType.getDefault().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);
+            return ServerResponse.createByErrorMsg("购买失败", request);
         }
     }
 
@@ -59,7 +89,13 @@
         return ServerResponse.createBySuccess(iEchoServices.queryOrderEcho(request));
     }
 
-
+    @PostMapping("queryOrderEchoPage.do")
+    @ResponseBody
+    public ServerResponse queryOrderEcho(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
+                                         HttpServletRequest request) {
+        return iEchoServices.queryOrderEchoPage(pageNum, pageSize, request);
+    }
 
 
 

--
Gitblit v1.9.3