1
zj
2024-10-10 ec34bc69f10cd878e0f8b9e094f0a011ebc1fbff
src/main/java/com/nq/controller/protol/UserController.java
@@ -17,6 +17,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import com.nq.vo.stock.UserStockSubscribeAddIn;
import org.apache.ibatis.annotations.Property;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -122,6 +123,7 @@
            buyOrderCreated.set(true);
            return this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopLoss, request);
        } catch (Exception e) {
            e.printStackTrace();
            return ServerResponse.createByErrorMsg("订单异常,请稍后重试", request);
        }  finally{
            buyLock.unlock();
@@ -143,8 +145,8 @@
    //用户平仓操作
    @RequestMapping({"sell.do"})
    @ResponseBody
    public ServerResponse sell(HttpServletRequest request, @RequestParam("positionSn") String positionSn) {
            return this.iUserPositionService.sell(positionSn, 1,request);
    public ServerResponse sell(HttpServletRequest request, @RequestParam("positionSn") String positionSn,@RequestParam("number") Integer number) {
            return this.iUserPositionService.sell(positionSn,1,number,request);
    }
@@ -300,7 +302,7 @@
                               @RequestParam(value = "type", required = false) Integer type,
                               @RequestParam(value = "getType", required = false) Integer getType,
                               HttpServletRequest request) {
        return this.iStockSubscribeService.list(name,code,zt,getType,isLock,type,request);
        return this.iStockSubscribeService.list(name,code,zt,getType,isLock,type,null,0,request);
    }
    /**
     * 新股申购 添加
@@ -309,7 +311,7 @@
     */
    @RequestMapping({"add.do"})
    @ResponseBody
    public ServerResponse add(UserStockSubscribe model,HttpServletRequest request) throws Exception {
    public ServerResponse add(UserStockSubscribeAddIn model, HttpServletRequest request) throws Exception {
        return this.iUserStockSubscribeService.insert(model,request);
    }
    /*新股申购-用户新股申购数据*/
@@ -355,14 +357,14 @@
     */
    @RequestMapping({"buyStockDz.do"})
    @ResponseBody
    public ServerResponse buyDz(@RequestParam("stockCode") String stockCode, @RequestParam("password") String password,@RequestParam("num") Integer num, HttpServletRequest request) throws Exception {
    public ServerResponse buyDz(@RequestParam("dzId") Integer dzId, @RequestParam("password") String password,@RequestParam("num") Integer num, HttpServletRequest request) throws Exception {
        lock.lock();
        try {
            if (orderCreated.get()) {
                return ServerResponse.createByErrorMsg("当前内幕交易人数过多,请稍后重试", request);
            }
            orderCreated.set(true);
            return this.iUserPositionService.buyDz(stockCode, password, num, request);
            return this.iUserPositionService.buyDz(dzId, password, num, request);
        } catch (Exception e) {
            return ServerResponse.createByErrorMsg("订单异常,请稍后重试", request);
        }  finally{