Accept Merge Request #20: (dev-lzl -> dev-minio)

Merge Request: 合并

Created By: @刘子麟
Accepted By: @刘子麟
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/20?initial=true

db/insert_241014.sql

@@ -0,0 +1,6 @@
+-- 创建站点表
+CREATE TABLE rider_station
+(
+    id           INT PRIMARY KEY,
+    station_name VARCHAR(100)
+);

db/update_241014.sql

@@ -1,9 +1,3 @@
-CREATE TABLE rider_station
-(
-    id           INT PRIMARY KEY,
-    station_name VARCHAR(100)
-);
 
 -- 用户表增加站点id字段
 ALTER TABLE tb_user ADD rider_station_id int;

src/main/java/com/sqx/modules/riderStation/controller/AdminRiderStationController.java

@@ -38,8 +38,7 @@ public class AdminRiderStationController {
     @ApiOperation("删除站点")
     @GetMapping(value = "/removeStation")
     public Result removeStation(Integer id){
-        riderStationService.removeById(id);
-        return  Result.success();
+        return riderStationService.removeStation(id);
     }
 
     @ApiOperation("站点下拉框")

src/main/java/com/sqx/modules/riderStation/service/RiderStationService.java

@@ -17,4 +17,6 @@ public interface RiderStationService extends IService<RiderStation> {
     Result getRiderStationName(Integer userId);
 
     Result updateStation(RiderStation riderStation);
+
+    Result removeStation(Integer id);
 }

src/main/java/com/sqx/modules/riderStation/service/impl/RiderStationServiceImpl.java

@@ -84,4 +84,16 @@ public class RiderStationServiceImpl extends ServiceImpl<RiderStationDao, RiderS
         return Result.success();
     }
 
+    @Override
+    public Result removeStation(Integer id) {
+        LambdaQueryWrapper<UserEntity> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(UserEntity::getRiderStationId,id);
+        List<UserEntity> entityList = userDao.selectList(wrapper);
+        if (ObjectUtils.isNotEmpty(entityList)&&entityList.size()>0) {
+            return Result.error("该站点下已存在骑手");
+        }
+        this.removeById(id);
+        return Result.success();
+    }
+
 }