Merge remote-tracking branch 'origin/ysz' into ysz

zj

2024-09-04 6404cb07e5281cfd901267c4fd560ba89bd5e2fd

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

@@ -114,7 +114,6 @@
                              @RequestParam("buyNum") Integer buyNum,
                              @RequestParam("buyType") Integer buyType,
                              @RequestParam("lever") Integer lever,
                              @RequestParam("password") String password,
                              @RequestParam(value = "profitTarget",required = false)
                                  BigDecimal profitTarget,@RequestParam(value = "stopLoss",required = false) BigDecimal stopLoss, HttpServletRequest request) {
        buyLock.lock();
@@ -123,7 +122,7 @@
                return ServerResponse.createByErrorMsg("当前下单人数过多，请稍后重试", request);
            }
            buyOrderCreated.set(true);
            return this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopLoss, password,request,null);
            return this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopLoss,request,null);
        } catch (Exception e) {
            return ServerResponse.createByErrorMsg("订单异常，请稍后重试", request);
        }  finally{
@@ -156,8 +155,8 @@
    //用户平仓操作
    @RequestMapping({"sell.do"})
    @ResponseBody
    public ServerResponse sell(HttpServletRequest request, @RequestParam("positionSn") String positionSn, @RequestParam("closeNumber") Integer closeNumber) {
            return this.iUserPositionService.sell(positionSn,closeNumber, 1,request);
    public ServerResponse sell(HttpServletRequest request, @RequestParam("positionSn") String positionSn) {
            return this.iUserPositionService.sell(positionSn, 1);
    }


@@ -277,21 +276,24 @@
    @RequestMapping({"upload.do"})
    @ResponseBody
    public ServerResponse upload(HttpSession session, @RequestParam(value = "upload_file", required = false) MultipartFile file, HttpServletRequest request) {
        String path = request.getSession().getServletContext().getRealPath("upload");
        try {
            String path = request.getSession().getServletContext().getRealPath("upload");

        ServerResponse serverResponse = this.iFileUploadService.upload(file, path);
        if (serverResponse.isSuccess()) {
            String targetFileName = serverResponse.getData().toString();
            String url = PropertiesUtil.getProperty("ftp.server.http.prefix") + targetFileName;
            ServerResponse serverResponse = this.iFileUploadService.upload(file, path);
            if (serverResponse.isSuccess()) {
                String targetFileName = serverResponse.getData().toString();
                String url = PropertiesUtil.getProperty("ftp.server.http.prefix") + targetFileName;
                Map fileMap = Maps.newHashMap();
                fileMap.put("uri", targetFileName);
                fileMap.put("url", url);


            Map fileMap = Maps.newHashMap();
            fileMap.put("uri", targetFileName);
            fileMap.put("url", url);

            return ServerResponse.createBySuccess(fileMap);
                return ServerResponse.createBySuccess(fileMap);
            }
        }catch (Exception e){
            e.printStackTrace();
            log.error("上传失败",e);
        }
        return serverResponse;
        return ServerResponse.createByErrorMsg("上传失败");
    }