From 6912d597b0ed44d36af5e26077cce111936fc7f2 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 31 Mar 2024 17:27:07 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java |  100 ++++++++++++++++++++------------------------------
 1 files changed, 40 insertions(+), 60 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 796615c..0fb782a 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -10,7 +10,7 @@
 import com.nq.dao.UserStockSubscribeMapper;
 import com.nq.pojo.*;
 import com.nq.service.*;
-import com.nq.utils.DateTimeUtil;
+import com.nq.utils.timeutil.DateTimeUtil;
 import com.nq.utils.KeyUtils;
 import com.nq.utils.PropertiesUtil;
 import com.nq.utils.redis.JsonUtil;
@@ -57,6 +57,8 @@
     IUserService iUserService;
     @Autowired
     ISiteSettingService iSiteSettingService;
+    @Autowired
+    TradingHourServiceImpl tradingHourService;
     /**
      * 用户新股申购
      * @param model
@@ -71,7 +73,6 @@
         String property = PropertiesUtil.getProperty("user.cookie.name");
         String header = request.getHeader(property);
         if (header != null) {
-            String userJson = RedisShardedPoolUtils.get(header);
             User user = this.iUserService.getCurrentRefreshUser(request);
             if (user == null){
                 return ServerResponse.createBySuccessMsg("請先登錄");
@@ -83,57 +84,51 @@
                 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()));
-//                if (userStockSubscribe != null) {
-//                    return ServerResponse.createByErrorMsg("请勿重复申购");
-//                }
+                UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.selectOne(new QueryWrapper<UserStockSubscribe>().eq("new_code", model.getNewCode()).eq("user_id", user.getId()));
+                if (userStockSubscribe != null) {
+                    return ServerResponse.createByErrorMsg("请勿重复申购");
+                }
                 if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
                     return ServerResponse.createByErrorMsg("Order failed, account has been locked");
                 }
                 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());
                 }
                 if (stockSubscribe.getType() == 2) {
-
-                    if (user.getEnableAmt().compareTo(new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice())) < 0) {
-                        return ServerResponse.createByErrorMsg("The user's available balance is insufficient, and the application conditions are not met足");
-                    }
-                    user.setEnableAmt(user.getEnableAmt().subtract(new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice())));
-                    if (user.getDjzj()!=null) {
-                        user.setDjzj(user.getDjzj().add(new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice())));
-                    }else
-                    {
-                        user.setDjzj(new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice()));
-                    }
                     int u = userMapper.updateById(user);
                     if (u <= 0) {
                         return ServerResponse.createByErrorMsg("Application failed due to unknown reasons");
@@ -145,7 +140,6 @@
                 model.setAgentName(user.getAgentName());
                 model.setPhone(user.getPhone());
                 model.setBuyPrice(stockSubscribe.getPrice());
-
                 model.setBond(new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice()));
                 model.setRealName(Objects.equals(user.getRealName(), "")||user.getRealName()==null ?"模拟用户无实名":user.getRealName());
                 model.setAddTime(new Date());
@@ -214,14 +208,12 @@
 
 
                     if (stockSubscribe.getType() == 2){
-                        User user = userMapper.selectByPrimaryKey(userStockSubscribe.getUserId());
+                        User user = userMapper.selectById(userStockSubscribe.getUserId());
                         UserStockSubscribe userStockSubscribe1 = userStockSubscribeMapper.load(model.getId());
                         int refundenum = userStockSubscribe1.getApplyNums() - model.getApplyNumber();
 //                        log.info("refundenum"+refundenum);
                         Integer refund =refundenum * stockSubscribe.getPrice().intValue();
 //                        log.info("退还金额"+refund);
-                        user.setEnableAmt(user.getEnableAmt().add(BigDecimal.valueOf(refund)));
-                        user.setDjzj(user.getDjzj().subtract(BigDecimal.valueOf(refund)));
                        int ret1 = userMapper.updateByPrimaryKey(user);
                        if (ret1 <= 0) {
                                 return ServerResponse.createByErrorMsg("Application failed due to unknown reasons");
@@ -245,9 +237,7 @@
                         siteMessage.setAddTime(DateTimeUtil.getCurrentDate());
                         iSiteMessageService.insert(siteMessage);
                     }else {
-                        User user = userMapper.selectByPrimaryKey(userStockSubscribe.getUserId());
-                        user.setEnableAmt(user.getEnableAmt().add(userStockSubscribe.getBond()));
-                        user.setDjzj(user.getDjzj().subtract(userStockSubscribe.getBond()));
+                        User user = userMapper.selectById(userStockSubscribe.getUserId());
                         userMapper.updateByPrimaryKey(user);
                         SiteMessage siteMessage = new SiteMessage();
                         siteMessage.setUserId(userStockSubscribe.getUserId());
@@ -326,7 +316,7 @@
                 }
             } else {
                 //指定用户发站内信
-                User user = userMapper.selectByPrimaryKey(model.getUserId());
+                User user = userMapper.selectById(model.getUserId());
                 SiteMessage siteMessage = new SiteMessage();
                 siteMessage.setUserId(user.getId());
                 siteMessage.setUserName(user.getRealName());
@@ -435,22 +425,12 @@
                     userStockSubscribe.setSubmitTime(DateTimeUtil.getCurrentDate());
                     userStockSubscribe.setStatus(4);
 
-                    User user1 = userMapper.selectByPrimaryKey(userStockSubscribe.getUserId());
+                    User user1 = userMapper.selectById(userStockSubscribe.getUserId());
 //                log.info("user" + user1);
-                    if (user1.getEnableAmt().compareTo(userStockSubscribe.getBond()) < 0) {
-                        return ServerResponse.createByErrorMsg("Insufficient balance");
-                    }
 //                    log.info("原可用资金"+user1.getEnableAmt());
-                    BigDecimal enableAmt = user1.getEnableAmt().subtract(userStockSubscribe.getBond());
 //                    log.info("enableAmt" + enableAmt);
-                    user1.setEnableAmt(enableAmt);
 //                    log.info("可用资金" + user1.getEnableAmt()+"保证金"+userStockSubscribe.getBond()+"原djzj"+user1.getDjzj());
-                    if (user1.getDjzj() != null) {
-                        user1.setDjzj(user1.getDjzj().add(userStockSubscribe.getBond()));
-                    }else {
-                        user1.setDjzj(userStockSubscribe.getBond());
-                    }
-                    ret = userMapper.updateByPrimaryKeySelective(user1);
+                    ret = userMapper.updateById(user1);
                 }
                 else {
                     return ServerResponse.createByErrorMsg("There is no fee for unsuccessful applicants");

--
Gitblit v1.9.3