From eb90e532330ced037ffc6ff76b4504c79ac59053 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 25 Sep 2024 10:57:55 +0800
Subject: [PATCH] 废弃

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

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 4891329..9d8ae2e 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -31,6 +31,8 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -71,7 +73,6 @@
 
     @Autowired
     UserAssetsMapper userAssetsMapper;
-
     /**
      * 用户新股申购
      * @param model
@@ -101,10 +102,13 @@
             if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
                 return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
             }
-            if(new Date().before(stockSubscribe.getSubscribeTime()) && new Date().after(stockSubscribe.getSubscribeTime()) ){
-                return ServerResponse.createByErrorMsg("不在认缴或配售时间之内",request);
+            Date currentDate = new Date();
+            if(currentDate.before(stockSubscribe.getSubscriptionTime())){
+                return ServerResponse.createByErrorMsg("未开售",request);
             }
-
+            if(currentDate.after(stockSubscribe.getSubscribeTime())){
+                return ServerResponse.createByErrorMsg("已结束",request);
+            }
 //            //重复申购限制
 //            UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.selectOne(new QueryWrapper<UserStockSubscribe>().eq(
 //                    "new_code", model.getNewCode()).eq("user_id", user.getId()).eq("type",model.getType()));

--
Gitblit v1.9.3