1

zj

8 days ago 16f5baf41e3224ccb43fce45de968833f9f022d2

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

@@ -14,6 +14,7 @@
import java.math.BigDecimal;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;

import com.nq.utils.SymmetricCryptoUtil;
@@ -61,6 +62,9 @@
    @Autowired
    StockMapper stockMapper;

    @Autowired
    IUserAgreementService iUserAgreementService;

    //添加到自选股
    @RequestMapping({"addOption.do"})
    @ResponseBody
@@ -88,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);
        }
@@ -99,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);
        }
@@ -121,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
@@ -297,6 +314,7 @@
     * 实名认证
     * @param realName
     * @param idCard
     * @param address
     * @param img1key
     * @param img2key
     * @param img3key
@@ -305,8 +323,8 @@
     */
    @RequestMapping({"auth.do"})
    @ResponseBody
    public ServerResponse auth(String realName, String idCard, String img1key, String img2key, String img3key, HttpServletRequest request) {
        return this.iUserService.auth(realName, idCard, img1key, img2key, "", request);
    public ServerResponse auth(String realName, String idCard, String address, String img1key, String img2key, String img3key, HttpServletRequest request) {
        return this.iUserService.auth(realName, idCard, address, img1key, img2key, "", request);
    }

    //图片上传
@@ -314,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();
@@ -466,4 +483,75 @@
              return serverResponse;
          }

    /**
     * 生成用户合同PDF
     */
    @RequestMapping({"generateAgreementPdf.do"})
    @ResponseBody
    public ServerResponse generateAgreementPdf(HttpServletRequest request) {
        return this.iUserAgreementService.generateAgreementPdf(request);
    }

    /**
     * 查看用户协议PDF
     */
    @RequestMapping({"viewAgreementPdf.do"})
    @ResponseBody
    public ServerResponse viewAgreementPdf(HttpServletRequest request) {
        return this.iUserAgreementService.viewAgreementPdf(request);
    }

    /**
     * 保存用户协议签名
     */
    @RequestMapping({"saveAgreementSignature.do"})
    @ResponseBody
    public ServerResponse saveAgreementSignature(@RequestParam("signature") MultipartFile signatureFile, HttpServletRequest request) {
        return this.iUserAgreementService.saveAgreementSignature(signatureFile, request);
    }

    /**
     * 生成用户合同PDF
     */
    @RequestMapping({"generateAgreementContractPdf.do"})
    @ResponseBody
    public ServerResponse generateAgreementContractPdf(HttpServletRequest request) {
        return this.iUserAgreementService.generateAgreementContractPdf(request);
    }

    /**
     * 查看用户合同PDF
     */
    @RequestMapping({"viewAgreementContractPdf.do"})
    public void viewAgreementContractPdf(HttpServletRequest request, HttpServletResponse response) {
        this.iUserAgreementService.viewAgreementContractPdf(request, response);
    }

    /**
     * 保存用户合同签名
     */
    @RequestMapping({"saveAgreementContractSignature.do"})
    @ResponseBody
    public ServerResponse saveAgreementContractSignature(@RequestParam("signature") MultipartFile signatureFile, HttpServletRequest request) {
        return this.iUserAgreementService.saveAgreementContractSignature(signatureFile, request);
    }

    /**
     * 查询合同图片列表
     */
    @RequestMapping({"getContractImages.do"})
    @ResponseBody
    public ServerResponse getContractImages(HttpServletRequest request) {
        return this.iUserAgreementService.getContractImages(request);
    }

    /**
     * 查询保密协议图片列表
     */
    @RequestMapping({"getAgreementImages.do"})
    @ResponseBody
    public ServerResponse getAgreementImages(HttpServletRequest request) {
        return this.iUserAgreementService.getAgreementImages(request);
    }

}