1

zj

2026-01-13 74f2dd24eb7241020319771c794d9e9f06264d7e

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

@@ -282,9 +282,9 @@
                if((model.getStatus() == 3 && model.getApplyNumber() == null) || (model.getStatus() == 3 && model.getApplyNumber() == 0) ){
                    return ServerResponse.createByErrorMsg("中签数量不能小于0");
                }
                if(model.getStatus() == 3 && model.getApplyNumber()>userStockSubscribe.getApplyNums()){
                    return  ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
                }
//                if(model.getStatus() == 3 && model.getApplyNumber()>userStockSubscribe.getApplyNums()){
//                    return  ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
//                }

                //客户中签直接扣除客户账户可用资金
                UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stockSubscribe.getStockType(), userStockSubscribe.getUserId());
@@ -298,7 +298,6 @@
                        }
                        model.setBond(bound);
                        model.setDbMoney(model.getDbMoney());

                        if(null == userAssets){
                            return ServerResponse.createByErrorMsg("客户资金账户不存在");
                        }
@@ -370,12 +369,12 @@
//                        }
                        ret = userStockSubscribeMapper.update1(model);
                        userAssetsMapper.updateById(userAssets);
                        iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
                        model.setStatus(5);
                        //iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
                        //model.setStatus(5);
                    }else{
                        if(model.getApplyNumber()>model.getApplyNums()){
                            return  ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
                        }
//                        if(model.getApplyNumber()>model.getApplyNums()){
//                            return  ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
//                        }
                        BigDecimal cCount = new BigDecimal(model.getApplyNums()-model.getApplyNumber());
                        BigDecimal tMoney = ((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice())).multiply(cCount);
                        iUserAssetsServices.availablebalanceChange(stockSubscribe.getStockType(),userStockSubscribe.getUserId(),