zyy
2025-07-21 f25b39e0d5fcae415a8824fc03d42fe681e96bf8
src/main/java/com/nq/controller/protol/UserController.java
@@ -1,9 +1,7 @@
package com.nq.controller.protol;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
import com.nq.common.ServerResponse;
import com.nq.enums.EStockType;
import com.nq.pojo.*;
@@ -20,13 +18,10 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import com.nq.utils.translate.GoogleTranslateUtil;
import com.nq.vo.stock.UserStockSubscribeAddIn;
import org.apache.ibatis.annotations.Property;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -45,12 +40,6 @@
    IFileUploadService iFileUploadService;
    @Autowired
    IUserIndexPositionService iUserIndexPositionService;
    @Autowired
    IUserFuturesPositionService iUserFuturesPositionService;
    @Autowired
    IUserStockSubscribeService iUserStockSubscribeService;
    @Autowired
    IStockSubscribeService iStockSubscribeService;
@@ -61,16 +50,10 @@
    IRateServices rateServices;
    @Autowired
    IUserRechargeService iUserRechargeService;
    @Autowired
    PayServiceImpl payService;
    @Autowired
    IApplyLeverServices iApplyLeverServices;
    @Autowired
    IUserWithdrawService iUserWithdrawService;
    private static final ThreadLocal<Boolean> orderCreated = ThreadLocal.withInitial(() -> false);
    private final Lock lock = new ReentrantLock();
@@ -292,6 +275,21 @@
        return serverResponse;
    }
    /**
     * 新股列表
     * @param pageNum
     * @param pageSize
     * @param request
     * @return
     */
    @RequestMapping({"getStockSubscribeList.do"})
    @ResponseBody
    public ServerResponse getStockSubscribeList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                               @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
                               HttpServletRequest request) {
        return this.iStockSubscribeService.listPageInfo(pageNum, pageSize, request);
    }
    /**
     * 用户新股列表
@@ -326,8 +324,10 @@
    /*新股申购-用户新股申购数据*/
    @RequestMapping({"getOneSubscribeByUserId.do"})
    @ResponseBody
    public ServerResponse getOneSubscribeByUserId(@RequestParam(value ="type",required = false)String type, HttpServletRequest request) {
        return this.iUserStockSubscribeService.getOneSubscribeByUserId(type,request);
    public ServerResponse getOneSubscribeByUserId(@RequestParam(value ="type",required = false)String type,
                                                  @RequestParam(value ="status",required = false)Integer status,
                                                  HttpServletRequest request) {
        return this.iUserStockSubscribeService.getOneSubscribeByUserId(type, status, request);
    }
    /*新股申购-用户提交金额*/
@@ -466,21 +466,5 @@
    @PostMapping({"rechargeCallbackTwo.do"})
    public void rechargeCallbackTwo(TransactionStatusVo vo, HttpServletResponse response) throws IOException {
        payService.rechargeCallbackTwo(vo,response);
    }
    /**
     * 代付回调通知
     */
    @PostMapping({"noticePayment.do"})
    public void noticePayment(TradeResultVO vo,HttpServletResponse response) throws IOException {
        iUserWithdrawService.noticePayment(vo,response);
    }
    /**
     * 代付2回调通知
     */
    @PostMapping({"noticePaymentTwo.do"})
    public void noticePaymentTwo(PaymentCallbackTwo vo,HttpServletResponse response) throws IOException {
        iUserWithdrawService.noticePaymentTwo(vo,response);
    }
}