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 ++++++++----
src/main/java/com/nq/pojo/StockSubscribe.java | 2 +-
src/main/java/com/nq/ws/WsClientConfig.java | 3 +++
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nq/pojo/StockSubscribe.java b/src/main/java/com/nq/pojo/StockSubscribe.java
index ed4376f..d7dd8bc 100644
--- a/src/main/java/com/nq/pojo/StockSubscribe.java
+++ b/src/main/java/com/nq/pojo/StockSubscribe.java
@@ -69,7 +69,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date listDate;
/**
- * 中签日期
+ * 开始时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date subscriptionTime;
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()));
diff --git a/src/main/java/com/nq/ws/WsClientConfig.java b/src/main/java/com/nq/ws/WsClientConfig.java
index 515ec22..c7c4f11 100644
--- a/src/main/java/com/nq/ws/WsClientConfig.java
+++ b/src/main/java/com/nq/ws/WsClientConfig.java
@@ -8,6 +8,7 @@
import com.nq.service.impl.MandatoryLiquidationService;
import com.nq.utils.ApplicationContextRegisterUtil;
import com.nq.utils.PropertiesUtil;
+import com.nq.utils.redis.RedisKeyUtil;
import com.nq.ws.client.IO;
import com.nq.ws.client.Socket;
import io.socket.emitter.Emitter;
@@ -81,6 +82,8 @@
socket.on("marketData", new Emitter.Listener() {
@Override
public void call(Object... args) {
+ StockRealTimeBean stockDetailBean = new Gson().fromJson(args[0].toString(), StockRealTimeBean.class);
+ RedisKeyUtil.setCacheRealTimeStock(EStockType.IN,stockDetailBean);
send(args[0].toString());
}
});
--
Gitblit v1.9.3