司机评分

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -467,7 +467,7 @@ public class RemoteContractServiceImpl implements RemoteContractService {
 
             //查询供应企业
             KwcContractLogisticsUnit unit = kwcContractLogisticsUnitRepository
-                    .queryByContractIdAndEntType(log.getId(), entId, EntTypeEnum.LOGISTICS3.getCode());
+                    .queryByContractIdAndEntType(log.getId(), EntTypeEnum.LOGISTICS3.getCode());
             if (unit != null) {
                 dto.setSupEntId(unit.getEntId());
             }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/repository/KwcContractLogisticsUnitRepository.java

@@ -87,10 +87,9 @@ public class KwcContractLogisticsUnitRepository extends ServiceImpl<KwcContractL
                 .last("limit 1"));
     }
 
-    public KwcContractLogisticsUnit queryByContractIdAndEntType(Long contractId, Long entId, Integer entType) {
+    public KwcContractLogisticsUnit queryByContractIdAndEntType(Long contractId, Integer entType) {
         return getOne(Wrappers.<KwcContractLogisticsUnit>lambdaQuery()
                 .eq(KwcContractLogisticsUnit::getContractId, contractId)
-                .eq(KwcContractLogisticsUnit::getEntId, entId)
                 .eq(KwcContractLogisticsUnit::getUnitType, entType)
                 .eq(KwcContractLogisticsUnit::getDelFlag,0)
                 .last("limit 1"));

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/ComeIntoHandler.java

@@ -123,7 +123,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
 //            return;
 //        }
         // 司机到达装货点是否超时（未按时到场）
-        checkArrivedLoadingPointTimeout(waybillOrder);
+//        checkArrivedLoadingPointTimeout(waybillOrder);
 
         //校验连续按时到场次数
         checkContinuousArriveTimes(waybillOrder);
@@ -192,14 +192,15 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
      * @param waybillOrder
      */
     private void checkContinuousArriveTimes(KwtWaybillOrder waybillOrder) {
+        Long supEntId = getSupplierId(waybillOrder);
         // 获取司机行为规则配置
-        DriverConductRulesVO driverRulesVO = getDriverConductRulesByEntId(waybillOrder.getEntId());
+        DriverConductRulesVO driverRulesVO = getDriverConductRulesByEntId(supEntId);
         //连续按时到场分数
         Integer continuousOnTimeScore = driverRulesVO.getContinuousOnTimeArriveScore();
         //连续按时到场次数
         Integer continuousOnTimeArriveTimes = driverRulesVO.getContinuousOnTimeArriveTimes();
         if (continuousOnTimeScore <= 0 || continuousOnTimeArriveTimes <= 0) {
-            log.warn("【司机连续按时到场】该司机无需加分，企业{}的连续按时到场次数/分数配置异常，运单ID：{}", waybillOrder.getEntId(), waybillOrder.getId());
+            log.warn("【司机连续按时到场】该司机无需加分，企业{}的连续按时到场次数/分数配置异常，运单ID：{}", supEntId, waybillOrder.getId());
             throw new BusinessPlatfromException(ErrorCodeEnum.DATA_NOT_EXIST, "【司机连续按时到场】次数/分数需大于0!");
         }
 
@@ -238,7 +239,6 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
         updateNode(waybillOrder, nodeIds, continuousOnTimeArriveTimes, continuousOnTimeScore);
 
         //2 .更新司机分数（加分）
-        Long supEntId = getSupplierId(waybillOrder);
         updateDriverScore(supEntId, waybillOrder.getEntId(), waybillOrder.getDriverId(), continuousOnTimeScore, "司机连续按时到场");
 
         //3. 更新企业分数（加分）