From 43d63ea7be939e33861ad8edd001de5cb8124ac0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 11:36:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java
index bbee426..bb93baa 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java
+++ b/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;
+ }
}
--
Gitblit v1.7.1