1

zj

2024-10-11 f37052eabfc9243e2004e7f2d0495f3b838225ad

1

 src/main/java/com/nq/controller/AgentApiController.java

@@ -7,6 +7,7 @@
import com.nq.pojo.UserStockSubscribe;
import com.nq.service.IAgentUserService;

import com.nq.service.IUserPositionService;
import com.nq.service.IUserStockSubscribeService;
import com.nq.utils.PropertiesUtil;

@@ -52,6 +53,9 @@
    @Autowired
    IUserStockSubscribeService iUserStockSubscribeService;

    @Autowired
    IUserPositionService iUserPositionService;

    //代理后台登录
    @RequestMapping({"login.do"})
    @ResponseBody
@@ -88,6 +92,8 @@
                                                @RequestParam(value = "pageSize", defaultValue = "12") int pageSize,
                                                @RequestParam(value = "keyword", defaultValue = "") String keyword,
                                                @RequestParam(value = "agentId", required = false) String agentId,
                                                @RequestParam(value = "name", required = false) String name,
                                                @RequestParam(value = "status", required = false) Integer status,
                                                HttpServletRequest request) {
        String loginToken = CookieUtils.readLoginToken(request, PropertiesUtil.getProperty("agent.cookie.name"));
        String agentJson = RedisShardedPoolUtils.get(loginToken);
@@ -95,7 +101,7 @@
        if (agentUser ==null){
            return   ServerResponse.createByError("請先登錄",null);
        }
        return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentUser.getId().toString(), request);
        return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentUser.getId().toString(),name,status, request);
    }

    //申购信息-添加 修改
@@ -111,5 +117,4 @@
    public ServerResponse delStockSubscribe(@RequestParam("id") int id, HttpServletRequest request) {
        return this.iUserStockSubscribeService.del(id, request);
    }

}

 src/main/java/com/nq/controller/agent/AgentPositionController.java

@@ -39,5 +39,12 @@
        return this.iUserPositionService.listByAgent(positionType, state, userId, agentId, positionSn, beginTime, endTime, request, pageNum, pageSize);
    }

    //新股转持仓
    @RequestMapping({"addUserPosition.do"})
    @ResponseBody
    public ServerResponse newStockToPosition(@RequestParam("id")Integer id) {
        return this.iUserPositionService.newStockToPosition(id);
    }

}


 src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java

@@ -93,8 +93,10 @@
                                                @RequestParam(value = "pageSize", defaultValue = "12") int pageSize,
                                                @RequestParam(value = "keyword", defaultValue = "") String keyword,
                                                @RequestParam(value = "agentId", required = false) String agentId,
                                                @RequestParam(value = "name", required = false) String name,
                                                @RequestParam(value = "status", required = false) Integer status,
                                                HttpServletRequest request) {
        return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentId, request);
        return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentId,name,status, request);
    }



 src/main/java/com/nq/dao/UserStockSubscribeMapper.java

@@ -51,7 +51,7 @@
     * @author lr
     * @date 2020/09/11
     **/
    List<UserStockSubscribe> pageList(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("keyword") String keyword,@Param("agentId") String agentId);
    List<UserStockSubscribe> pageList(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("keyword") String keyword,@Param("agentId") String agentId,@Param("agentId") String name,@Param("agentId") Integer status);

    /**
     * [查询] 分页查询 count

 src/main/java/com/nq/service/IUserStockSubscribeService.java

@@ -38,7 +38,7 @@
    /**
     * 新股申购-列表查询
     */
    ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword,String agentId, HttpServletRequest request);
    ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword,String agentId,String name,Integer status, HttpServletRequest request);

    /**
     * 新股申购-查询详情

 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java

@@ -397,9 +397,9 @@

    /*新股申购-查询列表*/
    @Override
    public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,HttpServletRequest request){
    public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,String name,Integer status,HttpServletRequest request){
        PageHelper.startPage(pageNum, pageSize);
        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId);
        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId,name,status);
        PageInfo pageInfo = new PageInfo(listData);
        pageInfo.setList(listData);
        return ServerResponse.createBySuccess(pageInfo);

 src/main/resources/mapper/UserStockSubscribeMapper.xml

@@ -216,6 +216,12 @@
        <if test="agentId != null and agentId != ''">
            and agent_id = #{agentId}
        </if>
        <if test="name != null and name != ''">
            and new_name = #{name}
        </if>
        <if test="status != null and status != ''">
            and status = #{status}
        </if>
        order by id desc
    </select>