From 7a4819fa64c0da1074f76fa1e7c0d90a11ed9cf3 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sat, 12 Jul 2025 10:38:30 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E4=BB=A3=E5=8F=91=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/StoreProductStockController.java | 2 +- .../xkt/UserAuthenticationController.java | 11 +++++++++ .../UserAuthAppPageResDTO.java | 23 +++++++++++++++++++ .../xkt/mapper/UserAuthenticationMapper.java | 10 ++++++++ .../service/IUserAuthenticationService.java | 12 ++++++++-- .../impl/UserAuthenticationServiceImpl.java | 16 ++++++++++++- .../mapper/StoreProductStockMapper.xml | 3 ++- .../mapper/UserAuthenticationMapper.xml | 16 +++++++++++++ 8 files changed, 88 insertions(+), 5 deletions(-) create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/userAuthentication/UserAuthAppPageResDTO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java index 9dfa5140e..9bc0fe4d6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java @@ -41,7 +41,7 @@ public class StoreProductStockController extends XktBaseController { final IStoreProductStockService storeProdStockService; - @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()") + @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store,seller,agent')||@ss.hasSupplierSubRole()") @ApiOperation(value = "查询档口库存列表", httpMethod = "POST", response = R.class) @PostMapping("/page") public R> selectPage(@Validated @RequestBody StoreProdStockPageVO pageVO) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAuthenticationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAuthenticationController.java index c46a18e4c..d1a3e418a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAuthenticationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAuthenticationController.java @@ -30,6 +30,10 @@ public class UserAuthenticationController extends XktBaseController { final IUserAuthenticationService userAuthService; + // APP 代发联系功能 + // APP 代发联系功能 + // APP 代发联系功能 + @PreAuthorize("@ss.hasAnyRoles('admin,general_admin')") @ApiOperation(value = "新增代发 ", httpMethod = "POST", response = R.class) @PostMapping() @@ -37,6 +41,13 @@ public class UserAuthenticationController extends XktBaseController { return R.ok(userAuthService.create(BeanUtil.toBean(createVO, UserAuthCreateDTO.class))); } + @PreAuthorize("@ss.hasAnyRoles('admin,general_admin')") + @ApiOperation(value = "APP 代发列表 ", httpMethod = "POST", response = R.class) + @PostMapping("/app/page") + public R> appPage(@Validated @RequestBody UserAuthPageVO pageVO) { + return R.ok(userAuthService.appPage(BeanUtil.toBean(pageVO, UserAuthPageDTO.class))); + } + @PreAuthorize("@ss.hasAnyRoles('admin,general_admin')") @ApiOperation(value = "查询代发列表 ", httpMethod = "POST", response = R.class) @PostMapping("/page") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userAuthentication/UserAuthAppPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userAuthentication/UserAuthAppPageResDTO.java new file mode 100644 index 000000000..ea9facc2b --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userAuthentication/UserAuthAppPageResDTO.java @@ -0,0 +1,23 @@ +package com.ruoyi.xkt.dto.userAuthentication; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liujiang + * @version v1.0 + * @date 2025/3/27 15:12 + */ +@Data +public class UserAuthAppPageResDTO { + + @ApiModelProperty(value = "代发ID") + private Long userAuthId; + @ApiModelProperty(value = "真实名称") + private String realName; + @ApiModelProperty(value = "联系电话") + private String phonenumber; + @ApiModelProperty(value = "头像") + private String avatar; + +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAuthenticationMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAuthenticationMapper.java index 189841775..65b7472e7 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAuthenticationMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAuthenticationMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.xkt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.xkt.domain.UserAuthentication; +import com.ruoyi.xkt.dto.userAuthentication.UserAuthAppPageResDTO; import com.ruoyi.xkt.dto.userAuthentication.UserAuthPageDTO; import com.ruoyi.xkt.dto.userAuthentication.UserAuthPageResDTO; import org.springframework.stereotype.Repository; @@ -24,4 +25,13 @@ public interface UserAuthenticationMapper extends BaseMapper * @return List */ List selectUserAuthPage(UserAuthPageDTO pageDTO); + + /** + * 筛选APP代发分页 + * + * @param pageDTO 分页入参 + * @return List + */ + List selectUserAuthAppPage(UserAuthPageDTO pageDTO); + } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IUserAuthenticationService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IUserAuthenticationService.java index 2eb0e2d97..b54f26efd 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IUserAuthenticationService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IUserAuthenticationService.java @@ -1,7 +1,6 @@ package com.ruoyi.xkt.service; import com.ruoyi.common.core.page.Page; -import com.ruoyi.xkt.dto.store.StoreAuditDTO; import com.ruoyi.xkt.dto.userAuthentication.*; /** @@ -14,8 +13,9 @@ public interface IUserAuthenticationService { /** * 新增代发 + * * @param createDTO 新增代发入参 - * @return Integer + * @return Integer */ Integer create(UserAuthCreateDTO createDTO); @@ -51,4 +51,12 @@ public interface IUserAuthenticationService { */ Integer approve(UserAuthAuditDTO auditDTO); + /** + * APP代发分页 + * + * @param pageDTO 分页入参 + * @return Page + */ + Page appPage(UserAuthPageDTO pageDTO); + } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAuthenticationServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAuthenticationServiceImpl.java index 9518faad4..3d705271b 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAuthenticationServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAuthenticationServiceImpl.java @@ -50,6 +50,21 @@ public class UserAuthenticationServiceImpl implements IUserAuthenticationService return userAuthMapper.insert(userAuth); } + /** + * APP代发分页 + * + * @param pageDTO 分页入参 + * @return Page + */ + @Override + @Transactional(readOnly = true) + public Page appPage(UserAuthPageDTO pageDTO) { + PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize()); + List list = this.userAuthMapper.selectUserAuthAppPage(pageDTO); + return Page.convert(new PageInfo<>(list)); + } + + /** * 代发分页 * @@ -125,5 +140,4 @@ public class UserAuthenticationServiceImpl implements IUserAuthenticationService return this.userAuthMapper.updateById(userAuth); } - } diff --git a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml index 6adb8f5ec..427b8fa64 100644 --- a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml @@ -20,7 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND sps.store_id = #{storeId} and sps.prod_art_num like concat('%', #{prodArtNum}, '%') ORDER BY - sps.create_time DESC + sps.store_prod_id, + sps.store_color_id + + \ No newline at end of file