From 53a149d9193c1df46bbfd0e5a344bce26576f7e3 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 08 Jul 2025 14:06:17 +0800
Subject: [PATCH] 同步股票、指数列表数据

---
 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index f202434..bde406e 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -86,7 +86,7 @@
         }
         User user = iUserService.getCurrentRefreshUser(request);
         synchronized (user.getId()){
-            UserAssets userAssets =   iUserAssetsServices.assetsByTypeAndUserId("IN",user.getId());
+
             if (model.getNewCode() != null) {
                 StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>()
                         .eq("newlist_id", model.getNewlistId()));
@@ -99,6 +99,7 @@
                 if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
                     return ServerResponse.createByErrorMsg("订单失败,请先实名认证",request);
                 }
+                UserAssets userAssets =   iUserAssetsServices.assetsByTypeAndUserId(stockSubscribe.getStockType(), user.getId());
                 if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
                     return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
                 }
@@ -191,7 +192,7 @@
 //                   bound =  new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice());
 //               }
 //
-                    BigDecimal useEnaAmount = iUserAssetsServices.getAvailableBalance(EStockType.IN.getCode(), user.getId());
+                    BigDecimal useEnaAmount = iUserAssetsServices.getAvailableBalance(EStockType.US.getCode(), user.getId());
                     if(useEnaAmount.compareTo(bound)<0){
                         return ServerResponse.createByErrorMsg("余额不足,配售失败",request);
                     }
@@ -210,7 +211,7 @@
                     UserStockSubscribe userStockSubscribe = Convert.convert(UserStockSubscribe.class, model);
                     userStockSubscribe.setNewStockId(stockSubscribe.getNewlistId());
                     ret = userStockSubscribeMapper.insert(userStockSubscribe);
-                    iUserAssetsServices.availablebalanceChange(EStockType.IN.getCode(), user.getId(),EUserAssets.BUY,bound.negate(),"","");
+                    iUserAssetsServices.availablebalanceChange(EStockType.US.getCode(), user.getId(),EUserAssets.BUY,bound.negate(),"","");
                     if (ret > 0) {
                         return ServerResponse.createBySuccessMsg("配售成功",request);
                     } else {
@@ -255,7 +256,7 @@
             }
 
             //客户中签直接扣除客户账户可用资金
-            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", userStockSubscribe.getUserId());
+            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stockSubscribe.getStockType(), userStockSubscribe.getUserId());
             if (model.getStatus() == 3 && model.getApplyNumber() != null){
                 if(stockSubscribe.getType() == 1){
                     model.setBond((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNumber())));
@@ -295,7 +296,7 @@
                     }
                     BigDecimal cCount = new BigDecimal(model.getApplyNums()-model.getApplyNumber());
                     BigDecimal tMoney = ((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice())).multiply(cCount);
-                    iUserAssetsServices.availablebalanceChange(EStockType.IN.getCode(),userStockSubscribe.getUserId(),
+                    iUserAssetsServices.availablebalanceChange(EStockType.US.getCode(),userStockSubscribe.getUserId(),
                             EUserAssets.TOP_UP,tMoney,"","");
                     model.setBond((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNumber())));
                     model.setDbMoney(BigDecimal.ZERO);
@@ -499,14 +500,14 @@
                     userStockSubscribe.setSubmitTime(DateTimeUtil.getCurrentDate());
                     userStockSubscribe.setStatus(4);
                     BigDecimal bigDecimal =  iUserAssetsServices.
-                            getAvailableBalance(EStockType.IN.getCode(),
+                            getAvailableBalance(EStockType.US.getCode(),
                                     userStockSubscribe.getUserId());
 
                     BigDecimal multiply = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(userStockSubscribe.getApplyNumber()));
                     if(bigDecimal.compareTo(multiply) <= 0){
                         return ServerResponse.createByErrorMsg("余额不足",request);
                     }
-                    iUserAssetsServices.availablebalanceChange(EStockType.IN.getCode(),userStockSubscribe.getUserId(),
+                    iUserAssetsServices.availablebalanceChange(EStockType.US.getCode(),userStockSubscribe.getUserId(),
                             EUserAssets.BUY,multiply.negate(),"","");
                     userStockSubscribe.setDbMoney(BigDecimal.ZERO);
                     userStockSubscribeMapper.update1(userStockSubscribe);

--
Gitblit v1.9.3