1

zj

2024-10-18 cd8df4afe77d1ea07c87f66714349ae0a699e67e

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

@@ -101,9 +101,9 @@
            if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
                return ServerResponse.createByErrorMsg("订单失败，请先实名认证",request);
            }
            if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
                return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
            }
//            if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
//                return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
//            }
            Date currentDate = new Date();
            if(currentDate.before(stockSubscribe.getSubscriptionTime())){
                return ServerResponse.createByErrorMsg("未开售",request);
@@ -397,9 +397,9 @@

    /*新股申购-查询列表*/
    @Override
    public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,HttpServletRequest request){
    public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,String name,Integer status,HttpServletRequest request){
        PageHelper.startPage(pageNum, pageSize);
        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId);
        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId,name,status);
        PageInfo pageInfo = new PageInfo(listData);
        pageInfo.setList(listData);
        return ServerResponse.createBySuccess(pageInfo);