From 4046f94a57f0c10e9509a49ad0d37d701aeb8186 Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Tue, 02 Apr 2024 23:47:51 +0800
Subject: [PATCH] 修复自选bug 和 增加流水日志
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index ee7a71f..0fb782a 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -57,6 +57,8 @@
IUserService iUserService;
@Autowired
ISiteSettingService iSiteSettingService;
+ @Autowired
+ TradingHourServiceImpl tradingHourService;
/**
* 用户新股申购
* @param model
@@ -82,9 +84,14 @@
if (siteProduct.getRealNameDisplay() && (StringUtils.isBlank(user.getRealName()) || StringUtils.isBlank(user.getIdCard()))) {
return ServerResponse.createByErrorMsg("Order failed, please first real name authentication");
}
- //判断休息日不能买入
- if (siteProduct.getHolidayDisplay()) {
- return ServerResponse.createByErrorMsg("No trading on weekends or holidays！");
+// //判断休息日不能买入
+// if (siteProduct.getHolidayDisplay()) {
+// return ServerResponse.createByErrorMsg("No trading on weekends or holidays！");
+// }
+ //判断股票是否在可交易时间段
+ Boolean b = tradingHourService.timeCheck();
+ if (b) {
+ return ServerResponse.createByErrorMsg("Order failed, not in the stock trading session");
}
//重复申购限制
UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.selectOne(new QueryWrapper<UserStockSubscribe>().eq("new_code", model.getNewCode()).eq("user_id", user.getId()));
@@ -97,26 +104,26 @@
if (stockSubscribe == null) {
return ServerResponse.createByErrorMsg("The new stock code does not exist");
}
- //时间判定当前时间是否是申购时间
- SiteSetting siteSetting = this.iSiteSettingService.getSiteSetting();
- if (siteSetting == null) {
- log.error("下单出错，网站设置表不存在");
- return ServerResponse.createByErrorMsg("Order failed, system setting error");
- }
- String am_begin = siteSetting.getTransAmBegin();
- String am_end = siteSetting.getTransAmEnd();
- String pm_begin = siteSetting.getTransPmBegin();
- String pm_end = siteSetting.getTransPmEnd();
- boolean am_flag = BuyAndSellUtils.isTransTime(am_begin, am_end);
- boolean pm_flag = BuyAndSellUtils.isTransTime(pm_begin, pm_end);
- log.info("是否在上午交易时间 = {} 是否在下午交易时间 = {}", Boolean.valueOf(am_flag), Boolean.valueOf(pm_flag));
- if (!am_flag && !pm_flag) {
- return ServerResponse.createByErrorMsg("Application failed, not in the trading session");
- }
- //时间判定当前时间是否是申购时间
- if (stockSubscribe.getSubscribeTime().getTime() < System.currentTimeMillis()) {
- return ServerResponse.createByErrorMsg("The application time has passed");
- }
+// //时间判定当前时间是否是申购时间
+// SiteSetting siteSetting = this.iSiteSettingService.getSiteSetting();
+// if (siteSetting == null) {
+// log.error("下单出错，网站设置表不存在");
+// return ServerResponse.createByErrorMsg("Order failed, system setting error");
+// }
+// String am_begin = siteSetting.getTransAmBegin();
+// String am_end = siteSetting.getTransAmEnd();
+// String pm_begin = siteSetting.getTransPmBegin();
+// String pm_end = siteSetting.getTransPmEnd();
+// boolean am_flag = BuyAndSellUtils.isTransTime(am_begin, am_end);
+// boolean pm_flag = BuyAndSellUtils.isTransTime(pm_begin, pm_end);
+// log.info("是否在上午交易时间 = {} 是否在下午交易时间 = {}", Boolean.valueOf(am_flag), Boolean.valueOf(pm_flag));
+// if (!am_flag && !pm_flag) {
+// return ServerResponse.createByErrorMsg("Application failed, not in the trading session");
+// }
+// //时间判定当前时间是否是申购时间
+// if (stockSubscribe.getSubscribeTime().getTime() < System.currentTimeMillis()) {
+// return ServerResponse.createByErrorMsg("The application time has passed");
+// }
if (model.getApplyNums() == null || model.getApplyNums() > stockSubscribe.getOrderNumber()|| model.getApplyNums() < 500) {
return ServerResponse.createByErrorMsg("The minimum purchase quantity is 500, the maximum is large" + stockSubscribe.getOrderNumber());
--
Gitblit v1.9.3