Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-16 cb490e56ee7bccbc3b56d6964e9b68e5aa8ec475

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java

@@ -1,9 +1,12 @@
package com.ruoyi.account.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.AgentApplication;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.dto.AgentQuery;
import com.ruoyi.account.mapper.AgentApplicationMapper;
import com.ruoyi.account.service.AgentApplicationService;
import com.ruoyi.account.service.AppUserService;
@@ -45,6 +48,7 @@
        AppUser appUser = appUserService.getById(loginUserApplet.getUserid());

        agentApplication.setAppUserId(loginUserApplet.getUserid());
        agentApplication.setStatus(1);
        agentApplication.setApplicationTime(LocalDateTime.now());
        agentApplication.setShopPoint(appUser.getShopPoint());
        agentApplication.setSharePoint(appUser.getSharePoint());
@@ -67,4 +71,13 @@
        agentApplication.setBindShopNum(shopList.size());
        agentApplicationMapper.insert(agentApplication);
    }

    @Override
    public IPage<AgentApplication> pageList(AgentQuery agentQuery) {
        Page<Shop> page = new Page<>();
        page.setCurrent(agentQuery.getPageNum());
        page.setSize(agentQuery.getPageSize());
        IPage<AgentApplication> shopIPage = agentApplicationMapper.pageList(page, agentQuery);
        return shopIPage;
    }
}