1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/DriverCarInfo.java

@@ -53,11 +53,11 @@ public class DriverCarInfo extends BaseModel<DriverCarInfo> {
      */
     private String carType;
     /**
-     * 车辆总质量（吨）
+     * 车辆总质量（千克）
      */
     private Float carTotalWeight;
     /**
-     * 核定载质量（吨）
+     * 核定载质量（千克）
      */
     private Float carApprovedWeight;
     /**

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverInfoServiceImpl.java

@@ -223,6 +223,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
                 driverInfo1.setQualificationOverdueFlag("0");
                 driverInfo1.setOperationOverdueFlag("0");
                 driverInfo1.setTrailerOperationOverdueFlag("0");
+                driverInfo1.setRejectReason(null);
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setReCommonId(driverInfo1.getCommonId());

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java

@@ -713,7 +713,9 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 //                            publishTaskInfo1.setCargoDistance(Math.floor(s));
 //                        }
                     }
-                    dataList.sort(Comparator.comparing(PublishTaskInfo::getCargoDistance));
+                    if (!CollectionUtils.isEmpty(dataList)){
+                        dataList.sort(Comparator.comparing(PublishTaskInfo::getCargoDistance));
+                    }
                 }
                 publishTaskInfoList.addAll(dataList);
             }
@@ -1144,9 +1146,11 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         //判断是否已抢过单
         OrderInfo orderInfo1 = orderInfoService.selectOne(new EntityWrapper<OrderInfo>().eq("common_id", publishTaskInfo.getDriverCommonId())
                 .eq("cargo_common_id", publishTaskInfo.getCommonId()).eq("delete_flag", "0"));
-        boolean order = "1".equals(orderInfo1.getCargoOwnerStatusKey());
-        if (order) {
-            throw new YException(YExceptionEnum.ORDER_SNATCHED);
+        if (orderInfo1 != null){
+            boolean order = "1".equals(orderInfo1.getCargoOwnerStatusKey());
+            if (order) {
+                throw new YException(YExceptionEnum.ORDER_SNATCHED);
+            }
         }
         boolean one = orderInfoService.insert(orderInfo);