【功能优化】优化门店店员功能

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java

@@ -3,14 +3,10 @@ package cn.iocoder.yudao.module.trade.controller.admin.delivery;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.security.core.LoginUser;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.*;
 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreStaffDO;
 import cn.iocoder.yudao.module.trade.service.delivery.DeliveryPickUpStoreService;
-import cn.iocoder.yudao.module.trade.service.delivery.DeliveryPickUpStoreStaffService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,9 +22,7 @@ import java.util.Collection;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static java.util.stream.Collectors.toList;
 
 @Tag(name = "管理后台 - 自提门店")
 @RestController
@@ -39,9 +33,6 @@ public class DeliveryPickUpStoreController {
     @Resource
     private DeliveryPickUpStoreService deliveryPickUpStoreService;
 
-    @Resource
-    private DeliveryPickUpStoreStaffService deliveryPickUpStoreStaffService;
-
     @PostMapping("/create")
     @Operation(summary = "创建自提门店")
     @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:create')")
@@ -78,8 +69,8 @@ public class DeliveryPickUpStoreController {
     @GetMapping("/list-all-simple")
     @Operation(summary = "获得自提门店精简信息列表")
     public CommonResult<List<DeliveryPickUpStoreSimpleRespVO>> getSimpleDeliveryPickUpStoreList() {
-        List<DeliveryPickUpStoreStaffDO> storeStaffDOS = deliveryPickUpStoreStaffService.selectStaffByUserId(getLoginUserId());
-        List<Long> storeIds = storeStaffDOS.stream().map(DeliveryPickUpStoreStaffDO::getStoreId).toList();
+        List<DeliveryPickUpStoreDO> storeStaffDOS = deliveryPickUpStoreService.selectStaffByUserId(getLoginUserId());
+        List<Long> storeIds = storeStaffDOS.stream().map(DeliveryPickUpStoreDO::getId).toList();
         if(!storeIds.isEmpty()){
             List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreListByStatus(
                     CommonStatusEnum.ENABLE.getStatus(), storeIds);
@@ -120,8 +111,7 @@ public class DeliveryPickUpStoreController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:query')")
     public CommonResult<DeliveryPickUpBindStoreStaffIdReqsVO> getDeliveryPickUpStoreStaff(@RequestParam("id") Long id) {
-        DeliveryPickUpStoreDO deliveryPickUpStore = deliveryPickUpStoreService.getDeliveryPickUpStore(id);
-        return success(deliveryPickUpStoreStaffService.getDeliveryPickUpStoreStaff(deliveryPickUpStore.getId(),deliveryPickUpStore.getName()));
+        return success(deliveryPickUpStoreService.getDeliveryPickUpStoreStaff(id));
     }
 
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreStaffController.java

@@ -1,46 +0,0 @@
-package cn.iocoder.yudao.module.trade.controller.admin.delivery;
-
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.*;
-import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
-import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
-import cn.iocoder.yudao.module.trade.service.delivery.DeliveryPickUpStoreService;
-import cn.iocoder.yudao.module.trade.service.delivery.DeliveryPickUpStoreStaffService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 自提门店店员")
-@RestController
-@RequestMapping("/trade/delivery/pick-up-store-staff")
-@Validated
-public class DeliveryPickUpStoreStaffController {
-
-
-    @Resource
-    private DeliveryPickUpStoreStaffService deliveryPickUpStoreStaffService;
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除自提门店店员")
-    @Parameter(name = "userId", description = "用户编号", required = true)
-    @Parameter(name = "storeId", description = "自提门店编号", required = true)
-    @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:delete')")
-    public CommonResult<Boolean> deleteDeliveryPickUpStoreStaff(@RequestParam("userId") Long id,@RequestParam("storeId") Long storeId) {
-        deliveryPickUpStoreStaffService.deleteDeliveryPickUpStoreStaff(id, storeId);
-        return success(true);
-    }
-
-}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryPickUpStoreDO.java

@@ -2,19 +2,23 @@ package cn.iocoder.yudao.module.trade.dal.dataobject.delivery;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.framework.mybatis.core.type.LongListTypeHandler;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.Data;
 
 import java.time.LocalTime;
+import java.util.List;
 
 /**
  * 自提门店 DO
  *
  * @author jason
  */
-@TableName(value ="trade_delivery_pick_up_store")
+@TableName(value ="trade_delivery_pick_up_store", autoResultMap = true)
 @KeySequence("trade_delivery_pick_up_store_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 public class DeliveryPickUpStoreDO extends BaseDO {
@@ -73,6 +77,11 @@ public class DeliveryPickUpStoreDO extends BaseDO {
      * 经度
      */
     private Double longitude;
+    /**
+     * 店员id列表
+     */
+    @TableField(typeHandler = LongListTypeHandler.class)
+    private List<Long> staffIds;
 
     /**
      * 门店状态

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryPickUpStoreStaffDO.java

@@ -1,51 +0,0 @@
-package cn.iocoder.yudao.module.trade.dal.dataobject.delivery;
-
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-// TODO @芋艿：后续再详细 review 一轮
-// TODO @芋艿：可能改成 DeliveryPickUpStoreUserDO
-/**
- * 自提门店店员 DO
- *
- * @author jason
- */
-@TableName(value ="trade_delivery_pick_up_store_staff")
-@KeySequence("trade_delivery_pick_up_store_staff_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
-@Data
-public class DeliveryPickUpStoreStaffDO extends BaseDO {
-
-    /**
-     * 编号，自增
-     */
-    @TableId
-    private Long id;
-
-    /**
-     * 自提门店编号
-     *
-     * 关联 {@link DeliveryPickUpStoreDO#getId()}
-     */
-    private Long storeId;
-
-    /**
-     * 管理员用户id
-     *
-     * 关联 {AdminUserDO#getId()}
-     */
-    private Long adminUserId;
-
-    /**
-     * 状态
-     *
-     * 枚举 {@link CommonStatusEnum}
-     */
-    private Integer status;
-
-}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/delivery/DeliveryPickUpStoreMapper.java

@@ -28,6 +28,10 @@ public interface DeliveryPickUpStoreMapper extends BaseMapperX<DeliveryPickUpSto
                 .inIfPresent(DeliveryPickUpStoreDO::getId, storeIds));
     }
 
+    default List<DeliveryPickUpStoreDO> selectStaffByUserId(Long userId){
+        return selectList(new LambdaQueryWrapperX<DeliveryPickUpStoreDO>()
+                .and(userId != null, w -> w.apply("FIND_IN_SET({0}, staff_ids)", userId)));
+    }
 }
 
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/delivery/DeliveryPickUpStoreStaffMapper.java

@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.module.trade.dal.mysql.delivery;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreStaffDO;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.Collections;
-import java.util.List;
-
-@Mapper
-public interface DeliveryPickUpStoreStaffMapper extends BaseMapperX<DeliveryPickUpStoreStaffDO> {
-
-    default Long selectStaffIdByUserIdAndStoreId(List<Long> userId, Long storeId){
-        return selectOne(new LambdaQueryWrapperX<DeliveryPickUpStoreStaffDO>()
-                .inIfPresent(DeliveryPickUpStoreStaffDO::getAdminUserId, userId)
-                .eqIfPresent(DeliveryPickUpStoreStaffDO::getStoreId, storeId))
-                .getId();
-    }
-
-    default List<DeliveryPickUpStoreStaffDO> getUserIdsByStoreId(Long id){
-        return selectList(new LambdaQueryWrapperX<DeliveryPickUpStoreStaffDO>()
-                .eq(DeliveryPickUpStoreStaffDO::getStoreId,id));
-    }
-
-    default void deleteStaffByUserIdsAndStoreId(List<Long> userIds, Long storeId){
-        Long StaffId = selectStaffIdByUserIdAndStoreId(userIds, storeId);
-        deleteById(StaffId);
-    }
-}
-
-
-
-

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreService.java

@@ -1,10 +1,7 @@
 package cn.iocoder.yudao.module.trade.service.delivery;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpBindStoreStaffIdReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.*;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
 
 import jakarta.validation.Valid;
@@ -80,4 +77,18 @@ public interface DeliveryPickUpStoreService {
      * @return
      */
     void bindDeliveryPickUpBindStoreStaffId(DeliveryPickUpBindStoreStaffIdReqVO bindStoreStaffIdVO);
+
+    /**
+     * 根据门店id获取自提店员
+     * @param id 门店id
+     * @return 自提店员
+     */
+    DeliveryPickUpBindStoreStaffIdReqsVO getDeliveryPickUpStoreStaff(Long id);
+
+    /**
+     * 根据用户id查询自提门店店员信息
+     * @param userId 用户id
+     * @return 自提门店店员信息
+     */
+    List<DeliveryPickUpStoreDO> selectStaffByUserId(Long userId);
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreServiceImpl.java

@@ -1,26 +1,18 @@
 package cn.iocoder.yudao.module.trade.service.delivery;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpBindStoreStaffIdReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.*;
 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreStaffDO;
 import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryPickUpStoreMapper;
-import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryPickUpStoreStaffMapper;
-import com.mchange.lang.LongUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import jakarta.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.PICK_UP_STORE_NOT_EXISTS;
@@ -36,8 +28,9 @@ public class DeliveryPickUpStoreServiceImpl implements DeliveryPickUpStoreServic
 
     @Resource
     private DeliveryPickUpStoreMapper deliveryPickUpStoreMapper;
+
     @Resource
-    private DeliveryPickUpStoreStaffMapper deliveryPickUpStoreStaffMapper;
+    private AdminUserApi adminUserApi;
 
     @Override
     public Long createDeliveryPickUpStore(DeliveryPickUpStoreCreateReqVO createReqVO) {
@@ -93,26 +86,23 @@ public class DeliveryPickUpStoreServiceImpl implements DeliveryPickUpStoreServic
 
     @Override
     public void bindDeliveryPickUpBindStoreStaffId(DeliveryPickUpBindStoreStaffIdReqVO bindStoreStaffIdVO) {
-        //查询旧列表
-        List<DeliveryPickUpStoreStaffDO> storeStaffDOS = deliveryPickUpStoreStaffMapper.getUserIdsByStoreId(bindStoreStaffIdVO.getId());
-        List<Long> oldStoreStaffIds = storeStaffDOS.stream().map(DeliveryPickUpStoreStaffDO::getAdminUserId).toList();
-        List<Long> newStoreStaffIds = bindStoreStaffIdVO.getStoreStaffIds();
-        List<List<Long>> diffList = CollectionUtils.diffList(oldStoreStaffIds, newStoreStaffIds, // id 不同，就认为是不同的记录
-                ObjectUtil::equal);
-        // 添加
-        if (CollUtil.isNotEmpty(diffList.get(0))) {
-            diffList.get(0).forEach(id -> {
-                DeliveryPickUpStoreStaffDO storeStaffDO = new DeliveryPickUpStoreStaffDO();
-                storeStaffDO.setStoreId(bindStoreStaffIdVO.getId());
-                storeStaffDO.setAdminUserId(id);
-                deliveryPickUpStoreStaffMapper.insert(storeStaffDO);
-            });
-        }
-        //删除
-        if (CollUtil.isNotEmpty(diffList.get(2))) {
-            deliveryPickUpStoreStaffMapper.deleteStaffByUserIdsAndStoreId(diffList.get(2), bindStoreStaffIdVO.getId());
-        }
+        DeliveryPickUpStoreDO deliveryPickUpStoreDO = deliveryPickUpStoreMapper.selectById(bindStoreStaffIdVO.getId());
+        deliveryPickUpStoreDO.setStaffIds(bindStoreStaffIdVO.getStoreStaffIds());
+        deliveryPickUpStoreMapper.updateById(deliveryPickUpStoreDO);
+    }
 
+    @Override
+    public DeliveryPickUpBindStoreStaffIdReqsVO getDeliveryPickUpStoreStaff(Long id) {
+        DeliveryPickUpStoreDO store = deliveryPickUpStoreMapper.selectById(id);
+        List<Long> adminUserIds = store.getStaffIds();
+        //2 查询绑定用户信息
+        List<AdminUserRespDTO> storeStaffs = adminUserApi.getUserList(adminUserIds);
+        return DeliveryPickUpBindStoreStaffIdReqsVO.builder().storeStaffs(storeStaffs).name(store.getName()).id(id).build();
+    }
+
+    @Override
+    public List<DeliveryPickUpStoreDO> selectStaffByUserId(Long userId) {
+        return deliveryPickUpStoreMapper.selectStaffByUserId(userId);
     }
 
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreStaffService.java

@@ -1,42 +0,0 @@
-package cn.iocoder.yudao.module.trade.service.delivery;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.*;
-import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreStaffDO;
-import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryPickUpStoreStaffMapper;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 自提门店店员 Service 接口
- *
- * @author jason
- */
-public interface DeliveryPickUpStoreStaffService {
-
-    /**
-     * 查询门店绑定用户信息数组
-     *
-     * @param id 门店编号
-     * @return 用户信息数组
-     */
-    DeliveryPickUpBindStoreStaffIdReqsVO getDeliveryPickUpStoreStaff(Long id, String name);
-
-    /**
-     * 删除自提门店店员
-     *
-     * @param id 门店店员编号
-     */
-    void deleteDeliveryPickUpStoreStaff(Long id, Long storeId);
-
-    /**
-     * 根据用户id查询自提门店店员信息
-     * @param userId
-     * @return
-     */
-    List<DeliveryPickUpStoreStaffDO> selectStaffByUserId(Long userId);
-}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreStaffServiceImpl.java

@@ -1,79 +0,0 @@
-package cn.iocoder.yudao.module.trade.service.delivery;
-
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.*;
-import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
-import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreStaffDO;
-import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryPickUpStoreMapper;
-import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryPickUpStoreStaffMapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.PICK_UP_STORE_NOT_EXISTS;
-import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.PICK_UP_STORE_STAFF_NOT_EXISTS;
-import static java.util.stream.Collectors.toList;
-
-/**
- * 自提门店店员 Service 实现类
- *
- * @author jason
- */
-@Service
-@Validated
-public class DeliveryPickUpStoreStaffServiceImpl implements DeliveryPickUpStoreStaffService {
-
-
-    @Resource
-    private DeliveryPickUpStoreStaffMapper deliveryPickUpStoreStaffMapper;
-
-    @Resource
-    private AdminUserApi adminUserApi;
-
-
-    @Override
-    public DeliveryPickUpBindStoreStaffIdReqsVO getDeliveryPickUpStoreStaff(Long id, String name) {
-        //1 查询绑定对应关系
-        List<DeliveryPickUpStoreStaffDO> storeStaffDOS = deliveryPickUpStoreStaffMapper.selectList(new LambdaQueryWrapperX<DeliveryPickUpStoreStaffDO>()
-                .eq(DeliveryPickUpStoreStaffDO::getStoreId, id)
-                .eq(DeliveryPickUpStoreStaffDO::getStatus, CommonStatusEnum.ENABLE.getStatus()));
-        List<Long> adminUserIds = storeStaffDOS.stream().map(DeliveryPickUpStoreStaffDO::getAdminUserId).collect(toList());
-        //2 查询绑定用户信息
-        List<AdminUserRespDTO> storeStaffs = adminUserApi.getUserList(adminUserIds);
-        return DeliveryPickUpBindStoreStaffIdReqsVO.builder().storeStaffs(storeStaffs).name(name).id(id).build();
-    }
-
-    @Override
-    public void deleteDeliveryPickUpStoreStaff(Long userId, Long storeId) {
-        //通过用户编号和自提门店id查询
-        Long StaffId = deliveryPickUpStoreStaffMapper.selectStaffIdByUserIdAndStoreId(Collections.singletonList(userId), storeId);
-        // 校验存在
-        validateDeliveryPickUpStoreStaffExists(StaffId);
-        // 删除
-        deliveryPickUpStoreStaffMapper.deleteById(StaffId);
-    }
-
-    @Override
-    public List<DeliveryPickUpStoreStaffDO> selectStaffByUserId(Long userId) {
-        return deliveryPickUpStoreStaffMapper.selectList(new LambdaQueryWrapper<DeliveryPickUpStoreStaffDO>().eq(DeliveryPickUpStoreStaffDO::getAdminUserId,userId));
-    }
-
-    private void validateDeliveryPickUpStoreStaffExists(Long id) {
-        if (deliveryPickUpStoreStaffMapper.selectById(id) == null) {
-            throw exception(PICK_UP_STORE_STAFF_NOT_EXISTS);
-        }
-    }
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqV
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
@@ -34,6 +35,9 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
                 .orderByDesc(AdminUserDO::getId);
         if(userIds != null){
+            if(userIds.isEmpty()){
+                return new PageResult<AdminUserDO>().setList(new ArrayList<>()).setTotal(0L);
+            }
             adminUserDOLambdaQueryWrapperX.in(AdminUserDO::getId, userIds);
         }
         return selectPage(reqVO, adminUserDOLambdaQueryWrapperX);