qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 调整

Browse Source
This commit is contained in:
邱贞招 2024-08-08 10:05:51 +08:00
parent aeba491f42
commit ccb1ee5fc4
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
View File

@ -1563,6 +1563,19 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
// order.setReturnTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, "2024-07-23 17:09:32"));//2024-06-28 18:15:56 // order.setReturnTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, "2024-07-23 17:09:32"));//2024-06-28 18:15:56
String token = Token.getToken(); String token = Token.getToken();
AsDevice device = asDeviceMapper.selectAsDeviceBySn(order.getSn()); AsDevice device = asDeviceMapper.selectAsDeviceBySn(order.getSn());
if(ObjectUtil.isNull(device)){
String usedSn = order.getUsedSn();
// 判断字符串中是否包含逗号
if (usedSn.contains(",")) {
// 使用逗号分割字符串
String[] parts = usedSn.split(",");
// 获取最后一个对象
String lastPart = parts[parts.length - 1];
order.setSn(lastPart);
} else {
order.setSn(usedSn);
}
}
if(ServiceConstants.RETURN_TYPE_NORMAL.equals(returnType)){ if(ServiceConstants.RETURN_TYPE_NORMAL.equals(returnType)){
if(!"true".equals(isBluetooth)){ if(!"true".equals(isBluetooth)){
/** 2. 车辆远程关锁*/ /** 2. 车辆远程关锁*/
@ -1641,11 +1654,13 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
throw new ServiceException("更新订单状态失败"); throw new ServiceException("更新订单状态失败");
} }
/** 5.记录行程*/ /** 5.记录行程*/
if(ObjectUtil.isNotNull(device)){
int tripLog = tripLogService.tripLog(order.getOrderNo(),device.getSn(),ServiceConstants.TRIP_LOG_TYPE_RETRUN_LOCK); int tripLog = tripLogService.tripLog(order.getOrderNo(),device.getSn(),ServiceConstants.TRIP_LOG_TYPE_RETRUN_LOCK);
if(tripLog==0){ if(tripLog==0){
log.info("【还车关锁】记录行程失败"); log.info("【还车关锁】记录行程失败");
throw new ServiceException("【还车关锁】记录行程失败"); throw new ServiceException("【还车关锁】记录行程失败");
} }
}
log.info("还车成功"); log.info("还车成功");
return Boolean.TRUE; return Boolean.TRUE;
}else{ }else{
@ -1821,7 +1836,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
} }
/** 调度费*/ /** 调度费*/
//判断是否在运营区内 //判断是否在运营区内
if(!isAreaZone(order.getSn(), area)){ if(StrUtil.isNotBlank(order.getSn()) && !isAreaZone(order.getSn(), area)){
BigDecimal dispatchFee = area.getDispatchFee();//调度费 BigDecimal dispatchFee = area.getDispatchFee();//调度费
order.setDispatchFee(dispatchFee); order.setDispatchFee(dispatchFee);
} }

3
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
View File

@ -1712,8 +1712,7 @@ public class EtOrderServiceImpl implements IEtOrderService
} }
newDevice.setLastTime(DateUtils.getNowDate()); newDevice.setLastTime(DateUtils.getNowDate());
} }
newDevice.setIsAdminUnlocking("1"); newDevice.setStatus(ServiceConstants.VEHICLE_STATUS_IN_USING);
newDevice.setStatus(ServiceConstants.VEHICLE_STATUS_SCHEDULING);
newDevice.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN); newDevice.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN);
int i = asDeviceMapper.updateAsDevice(newDevice); int i = asDeviceMapper.updateAsDevice(newDevice);
if(i>0){ if(i>0){