From 331800c37d20f0fb12513a8a4143b36c2e2764cb Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 02 Aug 2025 15:11:29 +0800
Subject: [PATCH] pc接口调整

---
 src/main/java/com/nq/controller/echo/EChoController.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nq/controller/echo/EChoController.java b/src/main/java/com/nq/controller/echo/EChoController.java
index bb854da..952d9de 100644
--- a/src/main/java/com/nq/controller/echo/EChoController.java
+++ b/src/main/java/com/nq/controller/echo/EChoController.java
@@ -2,14 +2,13 @@
 
 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;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,7 +18,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.math.BigInteger;
 
 /**
  * 利息报接口
@@ -50,6 +48,9 @@
     @PostMapping("buyEcho.do")
     @ResponseBody
     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);
@@ -59,11 +60,14 @@
             }
         }
         User user = this.iUserService.getCurrentRefreshUser(request);
-        UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId("IN", user.getId());
+        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,request)) {
+        if (iEchoServices.buyECho(eid, money, userAssets.getAccectType(), request)) {
             return ServerResponse.createBySuccess("购买成功",request);
         } else {
             return ServerResponse.createByErrorMsg("购买失败",request);
@@ -77,7 +81,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