src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java

@@ -116,7 +116,11 @@
//        if(null == stock){
//            return ServerResponse.createByErrorMsg("新股代码不存在");
//        }

        Long count = stockSubscribeMapper.selectCount(new LambdaQueryWrapper<StockSubscribe>()
                .eq(StockSubscribe::getCode, model.getCode()));
        if(count > 0){
            return ServerResponse.createByErrorMsg("新股代码已存在");
        }
        int resultCount = this.stockSubscribeMapper.insert(model);
        if (resultCount > 0) {
            return ServerResponse.createBySuccessMsg("添加新股成功");
@@ -137,6 +141,12 @@
        if (stockSubscribe == null) {
            return ServerResponse.createByErrorMsg("新股不存在");
        }
        Long count = stockSubscribeMapper.selectCount(new LambdaQueryWrapper<StockSubscribe>()
                .eq(StockSubscribe::getCode, model.getCode())
                .ne(StockSubscribe::getNewlistId,model.getNewlistId()));
        if(count > 0){
            return ServerResponse.createByErrorMsg("新股代码已存在");
        }

        //修改新股
        int resultCount = this.stockSubscribeMapper.updateById(model);

 src/main/java/com/nq/service/impl/UserServiceImpl.java

@@ -1,6 +1,7 @@
package com.nq.service.impl;

import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
@@ -105,6 +106,8 @@
    @Autowired
    StockPoll stockPoll;

    @Autowired
    StockSubscribeMapper stockSubscribeMapper;

    @Resource
    MoneyLogMapper mapper;
@@ -615,7 +618,21 @@
        if (userPositions.size() > 0) {
            for (UserPosition position : userPositions) {
                UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position, priceServices.getNowPrice(position.getStockCode()));

                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new LambdaQueryWrapper<StockSubscribe>()
                        .eq(StockSubscribe::getCode, userPositionVO.getStockCode()));
                if(position.getSellOrderId() == null){
                    if (null != stockSubscribe && DateUtil.date().before(stockSubscribe.getListDate())) {
                        userPositionVO.setProfitAndLose(BigDecimal.ZERO);
                    }else{
                        userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever())));
                    }
                }else{
                    userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever())));
                }

                userPositionVOS.add(userPositionVO);

            }
        }
        BigDecimal profitAndLose = BigDecimal.ZERO;

 src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java

@@ -1,6 +1,7 @@
package com.nq.service.impl;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.gson.Gson;
import com.nq.dao.*;
import com.nq.enums.EConfigKey;
@@ -20,12 +21,14 @@

import java.math.BigDecimal;

import java.time.LocalDate;
import java.util.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import com.nq.utils.timeutil.DateTimeUtil;
import com.nq.utils.timeutil.TimeUtil;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;

@@ -91,6 +94,9 @@
    @Autowired
    UserAssetsMapper userAssetsMapper;

    @Resource
    StockTimeSettingMapper stockTimeSettingMapper;

    @Transactional
    public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,String bankId,HttpServletRequest request) throws Exception {
        if (StringUtils.isBlank(amt)) {
@@ -123,12 +129,11 @@
                return ServerResponse.createByErrorMsg("Analog users cannot withdraw funds" + siteSetting.getWithMinAmt(),request);
            }


            String time = iStockConfigServices.queryByKey(EConfigKey.WITHDRAW_TIME_SETTING.getCode()).getCValue();

            if (!WithDrawUtils.checkIsWithTime( Integer.parseInt(time.split("-")[0]), Integer.parseInt(time.split("-")[1]))) {
                return ServerResponse.createByErrorMsg("提现失败。提现时间为" + time.split("-")[0] + " - " + time.split("-")[1],request);
            boolean b = getServerResponse();
            if (!b) {
                return ServerResponse.createByErrorMsg("提现失败,当前时间已停止提现", request);
            }

            BigDecimal useAmt =  iUserAssetsServices.getAvailableBalance(accsetType,user.getId());
            BigDecimal tAmt = new BigDecimal(amt);
            if(useAmt.compareTo(tAmt)<0){
@@ -162,6 +167,17 @@

    }

    private boolean getServerResponse() {
        StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type","IN"));
        if(stockTimeSetting == null){
            return false;
        }
        if(!stockTimeSetting.getWeekDay().contains(String.valueOf(LocalDate.now().getDayOfWeek().getValue()))){
            return false;
        }
        return TimeUtil.isTradingHour(stockTimeSetting.getAmStartTime(), stockTimeSetting.getAmEndTime(), stockTimeSetting.getPmStartTime(), stockTimeSetting.getPmEndTime());
    }

    public ServerResponse<PageInfo> findUserWithList(String withStatus, HttpServletRequest request, int pageNum, int pageSize) {

        PageHelper.startPage(pageNum, pageSize);