1

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

@@ -42,17 +42,16 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String loadingAdd(CarrierInfo carrierInfo) {
-        //根据id查询承运信息
         CarrierInfo carrierInfo1 = this.selectById(carrierInfo.getId());
-        if (carrierInfo1 != null) {
+        if (carrierInfo != null) {
             //判断暂存提交（前端传参1暂存3提交）
             if ("1".equals(carrierInfo.getStatusFlag())) {
-                carrierInfo1.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
-                carrierInfo1.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
+                carrierInfo.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
+                carrierInfo.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
             }
             else {
-                carrierInfo1.setStatus(StatusEnum.SUBMITTED.getName());
-                carrierInfo1.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
+                carrierInfo.setStatus(StatusEnum.SUBMITTED.getName());
+                carrierInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
                 //司机确认装车后，订单状态改为待货主确认装车
                 OrderInfo orderInfo = orderInfoService.selectOne(new EntityWrapper<OrderInfo>()
                     .eq("id",carrierInfo1.getOrderId())
@@ -73,7 +72,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
                 newsInfo.setNewsType("承运通知");
                 newsInfoService.addNewsInfo(newsInfo);
             }
-            this.updateById(carrierInfo1);
+            this.updateById(carrierInfo);
         }
         return "OK";
     }

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

@@ -74,7 +74,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         List<CargoOwnerInfo> cargoOwnerInfos = cargoOwnerInfoService.selectList(new EntityWrapper<CargoOwnerInfo>().eq("delete_flag", "0"));
         if (!CollectionUtils.isEmpty(cargoOwnerInfos)) {
             cargoOwnerInfos.forEach(cargoOwnerInfo -> {
-                cargoOwnerInfo.setRefreshTimes(0l);
+                cargoOwnerInfo.setRefreshTimes(0L);
             });
         }
     }