接单限制

performance-web/src/main/java/com/clx/performance/dao/breakcontract/BreakContractDriverRecordDao.java

@@ -11,6 +11,8 @@ import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractDriverRecord
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
+import java.time.LocalDateTime;
+
 /**
  * @author liruixin
  * Date 2023-10-24
@@ -20,7 +22,7 @@ public interface BreakContractDriverRecordDao extends BaseDao<BreakContractDrive
 
     boolean updateSettlementNo(BreakContractDriverRecord item);
 
-    Optional<BreakContractDriverRecord> selectLastLimitTimeByDriverUserNo(Long driverUserNo);
+    Optional<BreakContractDriverRecord> selectLastLimitTimeByDriverUserNo(Long driverUserNo, LocalDateTime time);
 
     IPage<BreakContractDriverRecordVO> pageByParam(PageBreakContractDriverRecordParam param);
     IPage<DriverBreakContractDriverRecordVO> driverPageByParam(DriverPageBreakContractDriverRecordParam param);

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractDriverRecordDaoImpl.java

@@ -14,6 +14,8 @@ import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
+
 /**
  * @author liruixin
  * Date 2023-10-24
@@ -31,11 +33,12 @@ public class BreakContractDriverRecordDaoImpl extends BaseDaoImpl<BreakContractD
     }
 
     @Override
-    public Optional<BreakContractDriverRecord> selectLastLimitTimeByDriverUserNo(Long driverUserNo) {
+    public Optional<BreakContractDriverRecord> selectLastLimitTimeByDriverUserNo(Long driverUserNo, LocalDateTime time) {
         return Optional.of(driverUserNo)
                 .map(item -> lQrWrapper()
                         .eq(BreakContractDriverRecord::getDriverUserNo, item)
                         .isNotNull(BreakContractDriverRecord::getLimitTime)
+                        .ge(BreakContractDriverRecord::getLimitTime, time)
                         .orderByDesc(BreakContractDriverRecord::getLimitTime)
                         .last("limit 1")
                 )

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -1405,7 +1405,7 @@ public class OrderChildServiceImpl implements OrderChildService {
      * 司机接单限制
      */
     private void driverTakeOrderLimit(Long driverUserNo){
-        Optional<BreakContractDriverRecord> limitOptional = breakContractDriverRecordDao.selectLastLimitTimeByDriverUserNo(driverUserNo);
+        Optional<BreakContractDriverRecord> limitOptional = breakContractDriverRecordDao.selectLastLimitTimeByDriverUserNo(driverUserNo, LocalDateTime.now());
         if (limitOptional.isPresent()){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_DRIVER_TAKE_ORDER_TIME_LIMIT,
                     PerformanceResultEnum.ORDER_CHILD_DRIVER_TAKE_ORDER_TIME_LIMIT.getMsg()+LocalDateTimeUtils.convertLocalDateTimeToString(limitOptional.get().getLimitTime(), "yyyy-MM-dd HH:mm"));