1

zj

6 days ago 7166584366406c107c3e46560580765f2db4cd5c

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

@@ -92,8 +92,7 @@
    public ServerResponse buy(@RequestParam("stockId") Integer stockId, @RequestParam("buyNum") Integer buyNum, @RequestParam("buyType") Integer buyType, @RequestParam("lever") Integer lever,@RequestParam(value = "profitTarget",required = false) BigDecimal profitTarget,@RequestParam(value = "stopTarget",required = false) BigDecimal stopTarget, HttpServletRequest request) {
        ServerResponse serverResponse = null;
        try {
//            serverResponse = this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopTarget, request);
            serverResponse = this.iUserPositionService.pending(stockId, buyNum, buyType, lever,profitTarget,stopTarget, request);
            serverResponse = this.iUserPositionService.buy(stockId, buyNum, buyType, lever, profitTarget, stopTarget, request);
        } catch (Exception e) {
            log.error("用户下单操作 = {}", e);
        }
@@ -103,10 +102,10 @@
    //用户下单买入股票
    @RequestMapping({"fee.do"})
    @ResponseBody
    public ServerResponse fee(@RequestParam("buyNum") Integer buyNum,@RequestParam("nowPrice") BigDecimal nowPrice,HttpServletRequest request) {
    public ServerResponse fee(@RequestParam("buyNum") Integer buyNum, @RequestParam("nowPrice") BigDecimal nowPrice, @RequestParam(value = "lever", required = false, defaultValue = "1") Integer lever, HttpServletRequest request) {
        ServerResponse serverResponse = null;
        try {
            serverResponse = this.iUserPositionService.fee(buyNum,nowPrice);
            serverResponse = this.iUserPositionService.fee(buyNum, nowPrice, lever);
        } catch (Exception e) {
            log.error("用户下单操作 = {}", e);
        }
@@ -125,6 +124,20 @@
        }
        return serverResponse;
    }
    //撤销委托单
    @RequestMapping({"cancelOrder.do"})
    @ResponseBody
    public ServerResponse cancelOrder(HttpServletRequest request, @RequestParam("positionSn") String positionSn) {
        ServerResponse serverResponse = null;
        try {
            serverResponse = this.iUserPositionService.cancelOrder(positionSn, request);
        } catch (Exception e) {
            log.error("用户撤单操作 = {}", e);
            serverResponse = ServerResponse.createByErrorMsg("撤单失败");
        }
        return serverResponse;
    }

    //用户平仓操作
    @RequestMapping({"sell.do"})
    @ResponseBody
@@ -319,7 +332,6 @@
    @ResponseBody
    public ServerResponse upload(HttpSession session, @RequestParam(value = "upload_file", required = false) MultipartFile file, HttpServletRequest request) {
//        String path = request.getSession().getServletContext().getRealPath("upload");
        String path = PropertiesUtil.getProperty("ftp.server.upload.dirs");
        ServerResponse serverResponse = this.iFileUploadService.uploadFile(file);
        if (serverResponse.isSuccess()) {
            String targetFileName = serverResponse.getData().toString();
@@ -484,8 +496,9 @@
     * 查看用户协议PDF
     */
    @RequestMapping({"viewAgreementPdf.do"})
    public void viewAgreementPdf(HttpServletRequest request, HttpServletResponse response) {
        this.iUserAgreementService.viewAgreementPdf(request, response);
    @ResponseBody
    public ServerResponse viewAgreementPdf(HttpServletRequest request) {
        return this.iUserAgreementService.viewAgreementPdf(request);
    }

    /**