From 665c763cb07deb261cf4fa62c6eb574aec1d816a Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 30 Dec 2024 14:03:05 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java |   14 +++++++-------
 1 files changed, 7 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 4877188..a9f6262 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -127,11 +127,11 @@
             }
 
 //            //重复申购限制
-//            UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.selectOne(new QueryWrapper<UserStockSubscribe>().eq(
-//                    "new_code", model.getNewCode()).eq("user_id", user.getId()).eq("type",model.getType()));
-//            if (userStockSubscribe != null) {
-//                return ServerResponse.createByErrorMsg("请勿重复申请",request);
-//            }
+            Long count = userStockSubscribeMapper.selectCount(new QueryWrapper<UserStockSubscribe>().eq(
+                    "new_code", model.getNewCode()).eq("user_id", user.getId()).eq("type", model.getType()));
+            if (count > 0) {
+                return ServerResponse.createByErrorMsg("请勿重复申请",request);
+            }
             if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
                 return ServerResponse.createByErrorMsg("订单失败,帐户已被锁定",request);
             }
@@ -268,7 +268,7 @@
                             //需要退回的资金
                             BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
                             userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(refundPrice));
-                            userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(refundPrice));
+                            userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice));
                         }
                     }else{
                         if(applyNumber > 0){
@@ -284,9 +284,9 @@
                         }
                     }
                     ret = userStockSubscribeMapper.update1(model);
+                    userAssetsMapper.updateById(userAssets);
                     iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
                     model.setStatus(5);
-                    userAssetsMapper.updateById(userAssets);
                 }else{
                     if(model.getApplyNumber()>model.getApplyNums()){
                         return  ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);

--
Gitblit v1.9.3