1

zj

2025-06-11 c695798cc137b1c6bd0a0a046bfe62c6e6f943f5

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

@@ -336,15 +336,16 @@
                .eq(UserAssets::getUserId, userPosition.getUserId())
                .eq(UserAssets::getAccectType, "IN")
        );
        if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
            return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
        }
//        Long count = userStockSubscribeMapper.selectCount(new LambdaQueryWrapper<>(UserStockSubscribe.class).eq(UserStockSubscribe::getNewCode, userPosition.getStockCode()));
//        if(count > 0 && userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
//            return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
//        }
        Boolean b = tradingHourService.timeCheck(userPosition.getStockCode());
        if (!b) {
            return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内", request);
        }
        if(userPosition.getPositionType() == 3){
            StockDz stockDz = stockDzMapper.selectOne(new LambdaQueryWrapper<StockDz>().eq(StockDz::getStockCode, userPosition.getStockCode()));
            StockDz stockDz = stockDzMapper.selectOne(new LambdaQueryWrapper<StockDz>().eq(StockDz::getId, userPosition.getDzId()));
            LocalDateTime buyOrderLocalDateTime = LocalDateTime.ofInstant(userPosition.getBuyOrderTime().toInstant(), ZoneId.systemDefault());
            // 计算天数差
            long daysBetween = ChronoUnit.DAYS.between(buyOrderLocalDateTime, LocalDateTime.now());
@@ -683,7 +684,7 @@
            end_time = DateTimeUtil.searchStrToTimestamp(endTime);
        }

        PageHelper.startPage(pageNum, pageSize);



        List<Integer> ids = new ArrayList<>();
@@ -691,7 +692,7 @@
            ids = getSubordinates(searchId);
            ids.add(searchId);
        }

        PageHelper.startPage(pageNum, pageSize);
        List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state,
                userId, ids, positionSn, begin_time, end_time,null);

@@ -1134,7 +1135,14 @@

    private AgentPositionVO assembleAgentPositionVO(UserPosition position) {
        AgentPositionVO agentPositionVO = new AgentPositionVO();

        User user = userMapper.selectById(position.getUserId());
        if(null != user){
            AgentUser agentUser = agentUserMapper.selectById(user.getAgentId());
            agentPositionVO.setPhone(user.getPhone());
            if(null != agentUser){
                agentPositionVO.setAgentName(agentUser.getAgentName());
            }
        }
        agentPositionVO.setId(position.getId());
        agentPositionVO.setPositionSn(position.getPositionSn());
        agentPositionVO.setPositionType(position.getPositionType());
@@ -1290,6 +1298,7 @@

            userPosition.setOrderStayDays(Integer.valueOf(0));
            userPosition.setOrderStayFee(new BigDecimal("0"));
            userPosition.setNewId(stockSubscribe.getNewlistId());

            int ret = 0;
            ret = this.userPositionMapper.insert(userPosition);
@@ -1630,7 +1639,7 @@

        //判断审核开关
        if(stockDz.getSwitchType() == 1){
            UserPosition userPosition = getUserPosition(num, user, stockDz, nowPrice, stock, buyAmt);
            UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
            UserPositionCheckDz userPositionCheckDz = Convert.convert(UserPositionCheckDz.class, userPosition);
            userPositionCheckDz.setDzId(dzId);
            userPositionCheckDzService.save(userPositionCheckDz);
@@ -1638,13 +1647,13 @@
        }

        // 创建UserPosition对象
        UserPosition userPosition = getUserPosition(num, user, stockDz, nowPrice, stock, buyAmt);
        UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
        userPositionMapper.insert(userPosition);
        userAssetsServices.availablebalanceChange(EStockType.IN.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
        return ServerResponse.createBySuccess("购买成功", request);
    }

    private UserPosition getUserPosition(Integer num, User user, StockDz stockDz, BigDecimal nowPrice, Stock stock, BigDecimal buyAmt) {
    private UserPosition getUserPosition(Integer dzId,Integer num, User user, StockDz stockDz, BigDecimal nowPrice, Stock stock, BigDecimal buyAmt) {
        UserPosition userPosition = new UserPosition();
        userPosition.setPositionType(3);
        userPosition.setPositionSn(KeyUtils.getUniqueKey());
@@ -1674,6 +1683,7 @@
        userPosition.setOrderStayDays(Integer.valueOf(0));
        userPosition.setOrderStayFee(new BigDecimal("0"));
        userPosition.setOrderSpread(BigDecimal.ZERO);
        userPosition.setDzId(dzId);
        return userPosition;
    }