新股修改

zyy

2025-07-15 c114364ebfef1cbfa5234dd76c7d70cda5662f68

新股修改

 src/main/java/com/nq/controller/protol/UserController.java

@@ -292,6 +292,21 @@
        return serverResponse;
    }

    /**
     * 新股列表
     * @param pageNum
     * @param pageSize
     * @param request
     * @return
     */
    @RequestMapping({"getStockSubscribeList.do"})
    @ResponseBody
    public ServerResponse getStockSubscribeList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                               @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
                               HttpServletRequest request) {
        return this.iStockSubscribeService.listPageInfo(pageNum, pageSize, request);
    }


    /**
     * 用户新股列表
@@ -326,8 +341,10 @@
    /*新股申购-用户新股申购数据*/
    @RequestMapping({"getOneSubscribeByUserId.do"})
    @ResponseBody
    public ServerResponse getOneSubscribeByUserId(@RequestParam(value ="type",required = false)String type, HttpServletRequest request) {
        return this.iUserStockSubscribeService.getOneSubscribeByUserId(type,request);
    public ServerResponse getOneSubscribeByUserId(@RequestParam(value ="type",required = false)String type,
                                                  @RequestParam(value ="status",required = false)Integer status,
                                                  HttpServletRequest request) {
        return this.iUserStockSubscribeService.getOneSubscribeByUserId(type, status, request);
    }

    /*新股申购-用户提交金额*/

 src/main/java/com/nq/service/IStockSubscribeService.java

@@ -4,6 +4,7 @@
import com.nq.common.ServerResponse;
import com.nq.pojo.StockSubscribe;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.bind.annotation.RequestParam;

import javax.servlet.http.HttpServletRequest;
import javax.xml.crypto.Data;
@@ -22,4 +23,7 @@
    ServerResponse update(StockSubscribe model, HttpServletRequest request);

    ServerResponse del(Integer id, HttpServletRequest request);

    ServerResponse listPageInfo(int pageNum, int pageSize, HttpServletRequest request);

}

 src/main/java/com/nq/service/IUserStockSubscribeService.java

@@ -5,6 +5,7 @@
import com.nq.common.ServerResponse;
import com.nq.pojo.UserStockSubscribe;
import com.nq.vo.stock.UserStockSubscribeAddIn;
import org.springframework.web.bind.annotation.RequestParam;

import javax.servlet.http.HttpServletRequest;

@@ -48,7 +49,7 @@
    /**
     * 新股申购-查询用户最新新股申购数据
     */
    ServerResponse getOneSubscribeByUserId(String type, HttpServletRequest request);
    ServerResponse getOneSubscribeByUserId(String type, Integer status, HttpServletRequest request);

    /**
     * 新股申购-用户提交金额
@@ -56,4 +57,5 @@
    ServerResponse userSubmit(Integer id,HttpServletRequest request);

    ServerResponse del(int id, HttpServletRequest request);

}

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

@@ -4,17 +4,17 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.nq.common.ServerResponse;
import com.nq.dao.StockMapper;
import com.nq.dao.UserPositionMapper;
import com.nq.dao.UserStockSubscribeMapper;
import com.nq.pojo.Stock;
import com.nq.pojo.StockSubscribe;
import com.nq.pojo.UserPosition;
import com.nq.pojo.UserStockSubscribe;
import com.nq.pojo.*;
import com.nq.service.IStockSubscribeService;
import com.nq.dao.StockSubscribeMapper;
import com.nq.service.IUserService;
import com.nq.vo.stock.ai.StockAiOrderTypeVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -45,6 +45,8 @@

    @Autowired
    UserPositionMapper userPositionMapper;
    @Autowired
    IUserService iUserService;

    /**
     * @Description: 用户新股列表
@@ -190,6 +192,35 @@
        return ServerResponse.createByErrorMsg("删除新股失败");
    }

    @Override
    public ServerResponse listPageInfo(int pageNum, int pageSize, HttpServletRequest request) {
        try {
            QueryWrapper<StockSubscribe> queryWrapper = new QueryWrapper();
            //显示 0
            queryWrapper.eq("zt", 0);
            queryWrapper.eq("type", 1);
            queryWrapper.orderByDesc("list_date");

            PageHelper.startPage(pageNum, pageSize);
            List<StockSubscribe> stockSubscribeList = this.stockSubscribeMapper.selectList(queryWrapper);
            // 获取分页信息
            PageInfo<StockSubscribe> pageInfo = new PageInfo<>(stockSubscribeList);

            Date newDate = new Date();
            pageInfo.getList().forEach(stockSubscribe -> {
                Date startDate = stockSubscribe.getSubscribeTime();
                Date endDate = stockSubscribe.getSubscriptionTime();

                boolean isBetween = newDate.after(startDate) && newDate.before(endDate);
                stockSubscribe.setIsBetween(isBetween);
            });
            return ServerResponse.createBySuccess(pageInfo);
        } catch (Exception e) {
            log.error("IStockSubscribeService listPageInfo error", e);
        }
        return ServerResponse.createByError();
    }

}



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

@@ -1853,7 +1853,7 @@
            PageInfo<UserPositionCheckDz> pageInfo = new PageInfo<>(userPositionCheckDzs);
            return ServerResponse.createBySuccess(pageInfo);
        } catch (Exception e) {
            log.error("StockAiService getStockAiOrderList error", e);
            log.error("IUserPositionService getDzOrderList error", e);
        }
        return ServerResponse.createByError();
    }

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

@@ -440,8 +440,7 @@
    public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,HttpServletRequest request){
        PageHelper.startPage(pageNum, pageSize);
        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId);
        PageInfo pageInfo = new PageInfo(listData);
        pageInfo.setList(listData);
        PageInfo<UserStockSubscribe> pageInfo = new PageInfo<>(listData);
        return ServerResponse.createBySuccess(pageInfo);
    }

@@ -453,17 +452,30 @@

    /*新股申购-查询用户最新新股申购数据*/
    @Override
    public ServerResponse getOneSubscribeByUserId(String type,HttpServletRequest request) {
    public ServerResponse getOneSubscribeByUserId(String type, Integer status, HttpServletRequest request) {
        String property = PropertiesUtil.getProperty("user.cookie.name");
        String header = request.getHeader(property);
        if (header != null) {
             User user = iUserService.getCurrentRefreshUser(request);
            List<UserStockSubscribe> userStockSubscribe = null;
            if (type==null||type.equals("")){


            QueryWrapper<UserStockSubscribe> queryWrapper = new QueryWrapper();
            queryWrapper.eq("user_id", user.getId());

            if (type != null && !type.isEmpty()){
                queryWrapper.eq("type", type);
            }
            if (status != null){
                queryWrapper.eq("status", status);
            }
            queryWrapper.orderByDesc("add_time");
            userStockSubscribe = this.userStockSubscribeMapper.selectList(queryWrapper);
            /*if (type==null||type.equals("")){
                userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).orderByDesc("add_time"));
            }else{
                userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).eq("type", type).orderByDesc("add_time"));
            }
            }*/

            List<UserStockSubscribe> list = new ArrayList<>();
            for (UserStockSubscribe userStockSubscribe1 : userStockSubscribe) {
@@ -539,9 +551,6 @@
        }
        return ServerResponse.createByErrorMsg("Operation failure");
    }





}