提交 1a6993bb authored 作者: liruixin's avatar liruixin

净重发生变化

上级 dc8b045e
...@@ -2,6 +2,7 @@ package com.clx.performance.extranal.user; ...@@ -2,6 +2,7 @@ package com.clx.performance.extranal.user;
import com.clx.user.vo.feign.DriverInfoFeignVo; import com.clx.user.vo.feign.DriverInfoFeignVo;
import com.clx.user.vo.feign.DriverTruckInfoFeignVo; import com.clx.user.vo.feign.DriverTruckInfoFeignVo;
import com.clx.user.vo.feign.FeignDriverTruckModelVo;
import com.msl.common.base.Optional; import com.msl.common.base.Optional;
public interface DriverService { public interface DriverService {
...@@ -15,4 +16,6 @@ public interface DriverService { ...@@ -15,4 +16,6 @@ public interface DriverService {
Optional<DriverInfoFeignVo> getDriverInfo(Long driverUserNo); Optional<DriverInfoFeignVo> getDriverInfo(Long driverUserNo);
Optional<FeignDriverTruckModelVo> getDumpType(String truckModel);//通过车型获取自卸非自卸
} }
...@@ -4,6 +4,7 @@ import com.clx.performance.extranal.user.DriverService; ...@@ -4,6 +4,7 @@ import com.clx.performance.extranal.user.DriverService;
import com.clx.user.feign.DriverFeign; import com.clx.user.feign.DriverFeign;
import com.clx.user.vo.feign.DriverInfoFeignVo; import com.clx.user.vo.feign.DriverInfoFeignVo;
import com.clx.user.vo.feign.DriverTruckInfoFeignVo; import com.clx.user.vo.feign.DriverTruckInfoFeignVo;
import com.clx.user.vo.feign.FeignDriverTruckModelVo;
import com.msl.common.base.Optional; import com.msl.common.base.Optional;
import com.msl.common.enums.ResultCodeEnum; import com.msl.common.enums.ResultCodeEnum;
import com.msl.common.exception.ServiceSystemException; import com.msl.common.exception.ServiceSystemException;
...@@ -54,4 +55,15 @@ public class DriverServiceImpl implements DriverService { ...@@ -54,4 +55,15 @@ public class DriverServiceImpl implements DriverService {
return Optional.ofNullable(result.getData()); return Optional.ofNullable(result.getData());
} }
@Override
public Optional<FeignDriverTruckModelVo> getDumpType(String truckModel) {
Result<FeignDriverTruckModelVo> result = Optional.ofNullable(driverFeign.getDriverTruckModel(truckModel)).orElseThrow(ResultCodeEnum.FAIL);
if (!Objects.equals(result.getCode(), 0)){
throw new ServiceSystemException(ResultCodeEnum.FAIL, result.getMsg());
}
return Optional.ofNullable(result.getData());
}
} }
...@@ -13,13 +13,17 @@ import com.clx.performance.constant.RabbitKeyConstants; ...@@ -13,13 +13,17 @@ import com.clx.performance.constant.RabbitKeyConstants;
import com.clx.performance.dto.dts.DataTransportDTO; import com.clx.performance.dto.dts.DataTransportDTO;
import com.clx.performance.enums.DtsOperationTypeEnum; import com.clx.performance.enums.DtsOperationTypeEnum;
import com.clx.performance.enums.OrderChildEnum; import com.clx.performance.enums.OrderChildEnum;
import com.clx.performance.extranal.user.DriverService;
import com.clx.performance.model.OrderChild; import com.clx.performance.model.OrderChild;
import com.clx.performance.service.LastTruckService; import com.clx.performance.service.LastTruckService;
import com.clx.performance.struct.OrderChildStruct; import com.clx.performance.struct.OrderChildStruct;
import com.clx.user.vo.feign.FeignDriverTruckModelVo;
import com.msl.common.enums.ResultCodeEnum;
import com.msl.common.result.Result; import com.msl.common.result.Result;
import com.msl.common.utils.DtsMapConvertUtil; import com.msl.common.utils.DtsMapConvertUtil;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.amqp.core.Message; import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -44,6 +48,9 @@ public class OrderChildDtsListener { ...@@ -44,6 +48,9 @@ public class OrderChildDtsListener {
@Autowired @Autowired
OrderChildStruct orderChildStruct; OrderChildStruct orderChildStruct;
@Autowired
private DriverService driverService;
@RabbitListener(queues = RabbitKeyConstants.CLX_PERFORMANCE_ORDER_CHILD_QUEUE) @RabbitListener(queues = RabbitKeyConstants.CLX_PERFORMANCE_ORDER_CHILD_QUEUE)
public void onMessage(Message message) { public void onMessage(Message message) {
...@@ -85,6 +92,12 @@ public class OrderChildDtsListener { ...@@ -85,6 +92,12 @@ public class OrderChildDtsListener {
} }
//同步交易平台的运单 //同步交易平台的运单
if(Objects.equals(orderInfoFeign.getOrderSource(), SyncPlatformEnum.TRADE_PLATFORM.getCode())){ if(Objects.equals(orderInfoFeign.getOrderSource(), SyncPlatformEnum.TRADE_PLATFORM.getCode())){
String truckModel = after.getTruckModel();
if(StringUtils.isNotBlank(truckModel)){
FeignDriverTruckModelVo dumpType = driverService.getDumpType(truckModel).orElseThrow(ResultCodeEnum.FAIL);
after.setDumpType(dumpType.getDumpType());
}
//同步after数据 //同步after数据
Optional<OrderChildEnum.Status> option = OrderChildEnum.Status.getByCode(after.getStatus()); Optional<OrderChildEnum.Status> option = OrderChildEnum.Status.getByCode(after.getStatus());
String statusName = option.isPresent()?option.get().getName():"未知状态"; String statusName = option.isPresent()?option.get().getName():"未知状态";
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论