新股修改

zyy

2025-07-15 c114364ebfef1cbfa5234dd76c7d70cda5662f68

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

@@ -86,7 +86,7 @@
        }
        User user = iUserService.getCurrentRefreshUser(request);
        synchronized (user.getId()){
            UserAssets userAssets =   iUserAssetsServices.assetsByTypeAndUserId("IN",user.getId());

            if (model.getNewCode() != null) {
                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>()
                        .eq("newlist_id", model.getNewlistId()));
@@ -99,6 +99,7 @@
                if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
                    return ServerResponse.createByErrorMsg("订单失败，请先实名认证",request);
                }
                UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stockSubscribe.getStockType(), user.getId());
                if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
                    return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
                }
@@ -255,7 +256,7 @@
            }

            //客户中签直接扣除客户账户可用资金
            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", userStockSubscribe.getUserId());
            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stockSubscribe.getStockType(), userStockSubscribe.getUserId());
            if (model.getStatus() == 3 && model.getApplyNumber() != null){
                if(stockSubscribe.getType() == 1){
                    model.setBond((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNumber())));
@@ -439,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);
    }

@@ -452,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) {
@@ -474,7 +487,7 @@
            }
            return ServerResponse.createBySuccess(list);
        }
        return ServerResponse.createByErrorMsg("请先登录",request);
        return ServerResponse.createByErrorCodeMsg(401,"请先登录");
    }
    /**
     * 新股申购-用户提交金额
@@ -518,7 +531,7 @@
                return ServerResponse.createByErrorMsg("新股认购订单不存在!",request);
            }
        }
        return ServerResponse.createByErrorMsg("请先登录",request);
        return ServerResponse.createByErrorCodeMsg(401,"请先登录");
    }
    /**
     * 新股申购-删除
@@ -538,9 +551,6 @@
        }
        return ServerResponse.createByErrorMsg("Operation failure");
    }





}