新增骑手持单上限功能，包括上限解析、校验及批量查询接口，并优化相关订单分配逻辑

杨刚
1 parent efa4fb8d
Showing 10 changed files with 155 additions and 41 deletions
src/main/java/com/diligrp/rider/controller/AdminRiderController.java
src/main/java/com/diligrp/rider/entity/Rider.java
src/main/java/com/diligrp/rider/service/AdminRiderService.java
src/main/java/com/diligrp/rider/service/RiderHoldLimitService.java
src/main/java/com/diligrp/rider/service/impl/AdminRiderServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/DispatchServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/RiderHoldLimitServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/RiderLocationServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/RiderOrderServiceImpl.java
src/main/resources/schema.sql
@@ -93,6 +93,15 @@ public class AdminRiderController {
         return Result.success();
     }
+    /** 设置个人持单上限：0=不限制 */
+    @PostMapping("/setHoldOrderLimit")
+    public Result<Void> setHoldOrderLimit(@RequestParam Long riderId,
+                                          @RequestParam int holdOrderLimit,
+                                          HttpServletRequest request) {
+        adminRiderService.setHoldOrderLimit(riderId, holdOrderLimit, resolveScopedCityId(request));
+        return Result.success();
+    }
+
     /** 指派骑手接单 */
     @PostMapping("/order/designate")
     public Result<Void> designate(@RequestParam Long orderId,
@@ -59,6 +59,9 @@ public class Rider {
     /** 是否休息：0=否 1=是 */
     private Integer isRest;
+    /** 个人持单上限：0=不限制 */
+    private Integer holdOrderLimit;
+
     /** 身份证号 */
     private String idNo;
@@ -22,6 +22,8 @@ public interface AdminRiderService {
     void setEnableStatus(Long riderId, int status, Long cityId);
     /** 切换全职/兼职 */
     void setType(Long riderId, int type, Long cityId);
+    /** 设置个人持单上限 */
+    void setHoldOrderLimit(Long riderId, int holdOrderLimit, Long cityId);
     /** 指派骑手接单 */
     void designate(Long orderId, Long riderId, Long cityId);
     /** 处理转单申请（1=通过 3=拒绝） */
+package com.diligrp.rider.service;
+
+import com.diligrp.rider.entity.Rider;
+import com.diligrp.rider.vo.DispatchRuleTemplateVO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface RiderHoldLimitService {
+    /** 当前持单量（status=3/4） */
+    int countCurrentLoad(Long riderId);
+
+    /** 批量查询当前持单量（status=3/4） */
+    Map<Long, Integer> getCurrentLoadMap(List<Long> riderIds);
+
+    /** 解析骑手个人持单上限，null 表示不限制 */
+    Integer resolveHoldOrderLimit(Rider rider);
+
+    /** 解析抢单场景生效上限，null 表示不限制 */
+    Integer resolveGrabLimit(Rider rider, DispatchRuleTemplateVO rule);
+
+    /** 校验骑手是否还能继续接单 */
+    void assertWithinLimit(Long riderId, Integer limit, String message);
+}
@@ -16,6 +16,7 @@ import com.diligrp.rider.entity.*;
 import com.diligrp.rider.mapper.*;
 import com.diligrp.rider.service.AdminRiderService;
 import com.diligrp.rider.service.DeliveryOrderService;
+import com.diligrp.rider.service.RiderHoldLimitService;
 import com.diligrp.rider.vo.DeliveryOrderCreateVO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -40,6 +41,7 @@ public class AdminRiderServiceImpl implements AdminRiderService {
     private final RiderBalanceMapper balanceMapper;
     private final AdminScopeGuard adminScopeGuard;
     private final DeliveryOrderService deliveryOrderService;
+    private final RiderHoldLimitService riderHoldLimitService;
     @Override
     public void add(AdminRiderAddDTO dto, Long cityId) {
@@ -171,6 +173,17 @@ public class AdminRiderServiceImpl implements AdminRiderService {
     }
     @Override
+    public void setHoldOrderLimit(Long riderId, int holdOrderLimit, Long cityId) {
+        if (holdOrderLimit < 0) throw new BizException("个人持单上限不能小于0");
+        Rider rider = riderMapper.selectById(riderId);
+        if (rider == null) throw new BizException("骑手不存在");
+        adminScopeGuard.assertCityAccessible(cityId, rider.getCityId());
+        riderMapper.update(null, new LambdaUpdateWrapper<Rider>()
+                .eq(Rider::getId, riderId)
+                .set(Rider::getHoldOrderLimit, holdOrderLimit));
+    }
+
+    @Override
     @Transactional
     public void designate(Long orderId, Long riderId, Long cityId) {
         Orders order = ordersMapper.selectById(orderId);
@@ -187,6 +200,8 @@ public class AdminRiderServiceImpl implements AdminRiderService {
         if (order.getIsTrans() == 1 && riderId.equals(order.getOldRiderId())) {
             throw new BizException("此订单为该骑手转单订单，无法指派给该骑手");
         }
+        Integer holdOrderLimit = riderHoldLimitService.resolveHoldOrderLimit(rider);
+        riderHoldLimitService.assertWithinLimit(riderId, holdOrderLimit, "该骑手当前持单量已达个人上限，无法指派");
         long now = System.currentTimeMillis() / 1000;
         LambdaUpdateWrapper<Orders> wrapper = new LambdaUpdateWrapper<Orders>()
@@ -7,6 +7,7 @@ import com.diligrp.rider.entity.*;
 import com.diligrp.rider.mapper.*;
 import com.diligrp.rider.service.DispatchRuleService;
 import com.diligrp.rider.service.DispatchService;
+import com.diligrp.rider.service.RiderHoldLimitService;
 import com.diligrp.rider.service.WebhookService;
 import com.diligrp.rider.util.GeoUtil;
 import com.diligrp.rider.vo.DispatchRuleTemplateVO;
@@ -33,6 +34,7 @@ public class DispatchServiceImpl implements DispatchService {
     private final OrdersMapper ordersMapper;
     private final RiderOrderCountMapper countMapper;
     private final RiderOrderRefuseMapper refuseMapper;
+    private final RiderHoldLimitService riderHoldLimitService;
     private final WebhookService webhookService;
     private final ObjectMapper objectMapper;
@@ -94,7 +96,7 @@ public class DispatchServiceImpl implements DispatchService {
         double orderTLng = parseDouble(order.getTLng());
         // 5. 预加载每个骑手的统计数据
-        Map<Long, Integer> currentLoadMap = getCurrentLoadMap(riderIds);
+        Map<Long, Integer> currentLoadMap = riderHoldLimitService.getCurrentLoadMap(riderIds);
         Map<Long, Integer> dailyCountMap = getDailyCountMap(riderIds);
         // 6. 对每个候选骑手评分
@@ -111,7 +113,8 @@ public class DispatchServiceImpl implements DispatchService {
             // 持单量检查（强制过滤）
             int currentLoad = currentLoadMap.getOrDefault(rider.getId(), 0);
-            if (rule.getGrabMaxPerRider() != null && currentLoad >= rule.getGrabMaxPerRider()) {
+            Integer holdOrderLimit = riderHoldLimitService.resolveHoldOrderLimit(rider);
+            if (holdOrderLimit != null && currentLoad >= holdOrderLimit) {
                 continue; // 持单已满，跳过
             }
@@ -283,21 +286,6 @@ public class DispatchServiceImpl implements DispatchService {
         return map;
     }
-    /** 获取每个骑手当前持单量（status=3 或 4 的订单数） */
-    private Map<Long, Integer> getCurrentLoadMap(List<Long> riderIds) {
-        Map<Long, Integer> map = new HashMap<>();
-        if (riderIds.isEmpty()) return map;
-        List<Orders> inProgress = ordersMapper.selectList(
-                new LambdaQueryWrapper<Orders>()
-                        .in(Orders::getRiderId, riderIds)
-                        .in(Orders::getStatus, List.of(3, 4))
-                        .select(Orders::getRiderId));
-        for (Orders o : inProgress) {
-            map.merge(o.getRiderId(), 1, Integer::sum);
-        }
-        return map;
-    }
-
     /** 获取每个骑手当日接单量 */
     private Map<Long, Integer> getDailyCountMap(List<Long> riderIds) {
         Map<Long, Integer> map = new HashMap<>();
+package com.diligrp.rider.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.diligrp.rider.common.exception.BizException;
+import com.diligrp.rider.entity.Orders;
+import com.diligrp.rider.entity.Rider;
+import com.diligrp.rider.mapper.OrdersMapper;
+import com.diligrp.rider.service.RiderHoldLimitService;
+import com.diligrp.rider.vo.DispatchRuleTemplateVO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class RiderHoldLimitServiceImpl implements RiderHoldLimitService {
+
+    private final OrdersMapper ordersMapper;
+
+    @Override
+    public int countCurrentLoad(Long riderId) {
+        if (riderId == null || riderId < 1) {
+            return 0;
+        }
+        return Math.toIntExact(ordersMapper.selectCount(new LambdaQueryWrapper<Orders>()
+                .eq(Orders::getRiderId, riderId)
+                .eq(Orders::getIsDel, 0)
+                .in(Orders::getStatus, List.of(3, 4))));
+    }
+
+    @Override
+    public Map<Long, Integer> getCurrentLoadMap(List<Long> riderIds) {
+        Map<Long, Integer> map = new HashMap<>();
+        if (riderIds == null || riderIds.isEmpty()) {
+            return map;
+        }
+        List<Orders> inProgress = ordersMapper.selectList(new LambdaQueryWrapper<Orders>()
+                .in(Orders::getRiderId, riderIds)
+                .eq(Orders::getIsDel, 0)
+                .in(Orders::getStatus, List.of(3, 4))
+                .select(Orders::getRiderId));
+        for (Orders order : inProgress) {
+            map.merge(order.getRiderId(), 1, Integer::sum);
+        }
+        return map;
+    }
+
+    @Override
+    public Integer resolveHoldOrderLimit(Rider rider) {
+        if (rider == null || rider.getHoldOrderLimit() == null || rider.getHoldOrderLimit() <= 0) {
+            return null;
+        }
+        return rider.getHoldOrderLimit();
+    }
+
+    @Override
+    public Integer resolveGrabLimit(Rider rider, DispatchRuleTemplateVO rule) {
+        Integer personalLimit = resolveHoldOrderLimit(rider);
+        Integer templateLimit = null;
+        if (rule != null && rule.getGrabEnabled() != null && rule.getGrabEnabled() == 1
+                && rule.getGrabMaxPerRider() != null && rule.getGrabMaxPerRider() > 0) {
+            templateLimit = rule.getGrabMaxPerRider();
+        }
+        if (personalLimit == null) {
+            return templateLimit;
+        }
+        if (templateLimit == null) {
+            return personalLimit;
+        }
+        return Math.min(personalLimit, templateLimit);
+    }
+
+    @Override
+    public void assertWithinLimit(Long riderId, Integer limit, String message) {
+        if (limit == null) {
+            return;
+        }
+        if (countCurrentLoad(riderId) >= limit) {
+            throw new BizException(message);
+        }
+    }
+}
@@ -10,12 +10,11 @@ import com.diligrp.rider.mapper.OrdersMapper;
 import com.diligrp.rider.mapper.RiderLocationMapper;
 import com.diligrp.rider.mapper.RiderMapper;
 import com.diligrp.rider.service.CityService;
-import com.diligrp.rider.service.DispatchRuleService;
+import com.diligrp.rider.service.RiderHoldLimitService;
 import com.diligrp.rider.service.RiderLocationService;
 import com.diligrp.rider.util.GeoUtil;
 import com.diligrp.rider.vo.AdminRiderDashboardVO;
 import com.diligrp.rider.vo.AdminRiderLocationVO;
-import com.diligrp.rider.vo.DispatchRuleTemplateVO;
 import com.diligrp.rider.vo.NearbyRiderVO;
 import com.diligrp.rider.websocket.LocationPushService;
 import lombok.RequiredArgsConstructor;
@@ -37,7 +36,7 @@ public class RiderLocationServiceImpl implements RiderLocationService {
     private final RiderMapper riderMapper;
     private final OrdersMapper ordersMapper;
     private final CityService cityService;
-    private final DispatchRuleService dispatchRuleService;
+    private final RiderHoldLimitService riderHoldLimitService;
     private final LocationPushService locationPushService;
     /**
@@ -146,9 +145,6 @@ public class RiderLocationServiceImpl implements RiderLocationService {
             return result;
         }
-        DispatchRuleTemplateVO rule = dispatchRuleService.getActiveRule(cityId);
-        Integer maxHoldOrderCount = normalizeMaxHoldOrderCount(rule);
-
         List<Rider> riders = riderMapper.selectList(new LambdaQueryWrapper<Rider>()
                 .eq(Rider::getCityId, cityId)
                 .orderByDesc(Rider::getId));
@@ -165,8 +161,8 @@ public class RiderLocationServiceImpl implements RiderLocationService {
                 .in(Orders::getStatus, List.of(3, 4))
                 .in(Orders::getRiderId, riderIds)
                 .eq(Orders::getIsDel, 0));
-        log.debug("商铺骑手看板基础数据查询完成，cityId={} riderCount={} locationCount={} holdingOrderCount={} maxHoldOrderCount={}",
-                cityId, riders.size(), locations.size(), holdingOrders.size(), maxHoldOrderCount);
+        log.debug("商铺骑手看板基础数据查询完成，cityId={} riderCount={} locationCount={} holdingOrderCount={}",
+                cityId, riders.size(), locations.size(), holdingOrders.size());
         java.util.Map<Long, RiderLocation> locationMap = new java.util.HashMap<>();
         for (RiderLocation location : locations) {
@@ -191,6 +187,7 @@ public class RiderLocationServiceImpl implements RiderLocationService {
             vo.setStatus(buildRiderStatus(rider, locationMap.get(rider.getId())));
             int holdOrderCount = holdCountMap.getOrDefault(rider.getId(), 0);
+            Integer maxHoldOrderCount = riderHoldLimitService.resolveHoldOrderLimit(rider);
             vo.setHoldOrderCount(holdOrderCount);
             vo.setMaxHoldOrderCount(maxHoldOrderCount);
             vo.setLoadRate(calcLoadRate(holdOrderCount, maxHoldOrderCount));
@@ -290,13 +287,6 @@ public class RiderLocationServiceImpl implements RiderLocationService {
         return "在线";
     }
-    private Integer normalizeMaxHoldOrderCount(DispatchRuleTemplateVO rule) {
-        if (rule == null || rule.getGrabMaxPerRider() == null || rule.getGrabMaxPerRider() <= 0) {
-            return null;
-        }
-        return rule.getGrabMaxPerRider();
-    }
-
     private Integer calcLoadRate(int holdOrderCount, Integer maxHoldOrderCount) {
         if (maxHoldOrderCount == null || maxHoldOrderCount <= 0) {
             return null;
@@ -8,6 +8,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.diligrp.rider.common.exception.BizException;
 import com.diligrp.rider.service.DispatchRuleService;
+import com.diligrp.rider.service.RiderHoldLimitService;
 import com.diligrp.rider.service.RiderLevelService;
 import com.diligrp.rider.service.RiderOrderService;
 import com.diligrp.rider.service.WebhookService;
@@ -40,6 +41,7 @@ public class RiderOrderServiceImpl implements RiderOrderService {
     private final RiderMapper riderMapper;
     private final RiderLevelService riderLevelService;
     private final DispatchRuleService dispatchRuleService;
+    private final RiderHoldLimitService riderHoldLimitService;
     private final ObjectMapper objectMapper;
     private final WebhookService webhookService;
@@ -130,14 +132,8 @@ public class RiderOrderServiceImpl implements RiderOrderService {
         }
         DispatchRuleTemplateVO rule = dispatchRuleService.getActiveRule(cityId);
-        if (rule != null && rule.getGrabMaxPerRider() != null && rule.getGrabMaxPerRider() > 0) {
-            Long currentLoad = ordersMapper.selectCount(new LambdaQueryWrapper<Orders>()
-                    .eq(Orders::getRiderId, riderId)
-                    .in(Orders::getStatus, List.of(3, 4)));
-            if (currentLoad >= rule.getGrabMaxPerRider()) {
-                throw new BizException(1000, "当前持单量已达上限，无法继续抢单");
-            }
-        }
+        Integer grabLimit = riderHoldLimitService.resolveGrabLimit(rider, rule);
+        riderHoldLimitService.assertWithinLimit(riderId, grabLimit, "当前持单量已达上限，无法继续抢单");
         if (order.getIsTrans() == 1 && riderId.equals(order.getOldRiderId())) {
             throw new BizException(980, "抢单失败，不能抢自己转出的单");
         }
@@ -20,6 +20,7 @@ CREATE TABLE `rider` (
   `status`         TINYINT         NOT NULL DEFAULT 1 COMMENT '账号状态：0=禁用 1=正常',
   `balance`        DECIMAL(10,2)   NOT NULL DEFAULT 0.00 COMMENT '余额（兼职用）',
   `is_rest`        TINYINT         NOT NULL DEFAULT 0 COMMENT '是否休息：0=否 1=是',
+  `hold_order_limit` INT           NOT NULL DEFAULT 0 COMMENT '个人持单上限，0=不限制',
   `id_no`          VARCHAR(32)     NOT NULL DEFAULT '' COMMENT '身份证号',
   `thumb`          VARCHAR(255)    NOT NULL DEFAULT '' COMMENT '手持身份证照片',
   `create_time`    BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '注册时间',
@@ -500,7 +501,8 @@ ALTER TABLE `orders` ADD COLUMN `ext_store_id` BIGINT UNSIGNED NOT NULL DEFAULT 
 ALTER TABLE `orders` ADD COLUMN `dispatch_time` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '系统派单时间' AFTER `trans_time`;
 ALTER TABLE `orders` ADD COLUMN `dispatch_rider_id` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '系统指派骑手ID' AFTER `dispatch_time`;
--- rider 表补充评分统计字段
+-- rider 表补充个人持单上限与评分统计字段
+ALTER TABLE `rider` ADD COLUMN `hold_order_limit` INT NOT NULL DEFAULT 0 COMMENT '个人持单上限，0=不限制' AFTER `is_rest`;
 ALTER TABLE `rider` ADD COLUMN `star_total` INT NOT NULL DEFAULT 0 COMMENT '评分总分' AFTER `thumb`;
 ALTER TABLE `rider` ADD COLUMN `star_count` INT NOT NULL DEFAULT 0 COMMENT '评分次数' AFTER `star_total`;