1

zj

2024-07-18 7c6c9e822f33ac120036af42fcf33b5b0e443351

1

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

@@ -3,8 +3,10 @@

import com.nq.common.ServerResponse;

import com.nq.pojo.UserStockSubscribe;
import com.nq.service.IAgentUserService;

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

import com.nq.utils.redis.CookieUtils;
@@ -46,6 +48,9 @@
    @Autowired
    IAgentUserService iAgentUserService;

    @Autowired
    IUserStockSubscribeService iUserStockSubscribeService;

    //代理后台登录
    @RequestMapping({"login.do"})
    @ResponseBody
@@ -74,4 +79,30 @@
        CookieUtils.delLoginToken(httpServletRequest, httpServletResponse, cookie_name);
        return ServerResponse.createBySuccess();
    }

    //申购信息列表查询
    @RequestMapping({"getStockSubscribeList.do"})
    @ResponseBody
    public ServerResponse getStockSubscribeList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                @RequestParam(value = "pageSize", defaultValue = "12") int pageSize,
                                                @RequestParam(value = "keyword", defaultValue = "") String keyword,
                                                @RequestParam(value = "agentId", required = false) String agentId,
                                                HttpServletRequest request) {
        return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentId, request);
    }

    //申购信息-添加 修改
    @RequestMapping({"saveStockSubscribe.do"})
    @ResponseBody
    public ServerResponse saveStockSubscribe(UserStockSubscribe model, HttpServletRequest request) {
        return this.iUserStockSubscribeService.save(model, request);
    }

    //新股申购-删除
    @RequestMapping({"delStockSubscribe.do"})
    @ResponseBody
    public ServerResponse delStockSubscribe(@RequestParam("id") int id, HttpServletRequest request) {
        return this.iUserStockSubscribeService.del(id, request);
    }

}

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

@@ -59,7 +59,8 @@
    public ServerResponse getList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                  @RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
                                  @RequestParam(value = "type", required = false) Integer type,
                                  @RequestParam(value = "stockCode", required = false) String stockCode) {
                                  @RequestParam(value = "stockCode", required = false)String stockCode,
                                  @RequestParam(value = "agentId", required = false) String agentId) {
        Page<UserPositionCheckDz> page = Page.of(pageNum, pageSize);
        LambdaQueryWrapper<UserPositionCheckDz> queryWrapper = new LambdaQueryWrapper<UserPositionCheckDz>();

@@ -68,6 +69,10 @@
            queryWrapper.eq(UserPositionCheckDz::getCheckType, type);
        }

        if (agentId != null) {
            queryWrapper.eq(UserPositionCheckDz::getAgentId, agentId);
        }

        // 判断stockCode是否为空，不为空则加入查询条件
        if (stockCode != null) {
            queryWrapper.eq(UserPositionCheckDz::getStockCode, stockCode);

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

@@ -89,8 +89,12 @@
    //申购信息列表查询
    @RequestMapping({"getStockSubscribeList.do"})
    @ResponseBody
    public ServerResponse getStockSubscribeList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "12") int pageSize, @RequestParam(value = "keyword", defaultValue = "") String keyword, HttpServletRequest request) {
        return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword, request);
    public ServerResponse getStockSubscribeList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                @RequestParam(value = "pageSize", defaultValue = "12") int pageSize,
                                                @RequestParam(value = "keyword", defaultValue = "") String keyword,
                                                @RequestParam(value = "agentId", required = false) String agentId,
                                                HttpServletRequest request) {
        return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentId, 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);
    List<UserStockSubscribe> pageList(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("keyword") String keyword,@Param("agentId") String agentId);

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

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

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

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

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

@@ -4,11 +4,16 @@
import com.nq.common.ServerResponse;
import com.nq.dao.MoneyLogMapper;
import com.nq.dao.UserAssetsMapper;
import com.nq.dao.UserMapper;
import com.nq.dao.UserRechargeMapper;
import com.nq.enums.EStockType;
import com.nq.enums.EUserAssets;
import com.nq.pojo.MoneyLog;
import com.nq.pojo.User;
import com.nq.pojo.UserAssets;
import com.nq.pojo.UserRecharge;
import com.nq.service.IUserAssetsServices;
import com.nq.utils.KeyUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -35,6 +40,12 @@

    @Autowired
    UserWithdrawServiceImpl withdrawService;

    @Resource
    UserRechargeMapper userRechargeMapper;

    @Resource
    UserMapper userMapper;

    @Override
    public UserAssets assetsByTypeAndUserId(String accetType, Integer userId) {
@@ -86,6 +97,7 @@
                userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(bigAmt));
            }
            if( userAssetsMapper.updateById(userAssets)>0){
                saveUserRecharge(userAssets.getUserId(),bigAmt);
                return ServerResponse.createBySuccess();
            }else{
                return ServerResponse.createByErrorMsg("修改金额失败");
@@ -101,6 +113,28 @@
        }
    }

    public void saveUserRecharge(Integer userId ,BigDecimal amt){
        User user = this.userMapper.selectById(userId);
        if (user == null) {
            return;
        }
        UserRecharge userRecharge = new UserRecharge();
        userRecharge.setUserId(user.getId());
        userRecharge.setNickName(user.getRealName());
        userRecharge.setAgentId(user.getAgentId());

        String ordersn = KeyUtils.getRechargeOrderSn();
        userRecharge.setOrderSn(ordersn);

        userRecharge.setPayChannel("1");
        userRecharge.setPayAmt(new BigDecimal(amt.intValue()));
        userRecharge.setAddTime(new Date());
        userRecharge.setPayTime(new Date());
        userRecharge.setOrderStatus(Integer.valueOf(1));
        userRecharge.setPayId(1);
        userRechargeMapper.insert(userRecharge);
    }


    @Override
    public List<UserAssets> assetsByUserId(Integer userId) {

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

@@ -279,6 +279,7 @@
            User user =  userMapper.selectById(u.getUserId());
            if(user != null){
                u.setUserPhone(user.getPhone());
                u.setNickName(user.getRealName());
            }

        }

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

@@ -837,8 +837,8 @@
            userOuts.add(userOut);
        }

        PageInfo pageInfo = new PageInfo(userOuts);

        PageInfo pageInfo = new PageInfo(users);
        pageInfo.setList(userOuts);
        return ServerResponse.createBySuccess(pageInfo);
    }


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

@@ -377,9 +377,9 @@

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

 src/main/resources/mapper/UserStockSubscribeMapper.xml

@@ -213,6 +213,9 @@
        <if test="keyword != null and keyword != ''">
            and (user_id = #{keyword} or real_name like CONCAT('%',#{keyword},'%') or phone like CONCAT('%',#{keyword},'%'))
        </if>
        <if test="agentId != null and agentId != ''">
            and agent_id = #{agentId}
        </if>
        order by id desc
    </select>