Commit bb2bd44a authored by 杨钧's avatar 杨钧

修改查询订单信息接口

parent 0546e782
...@@ -35,7 +35,7 @@ import java.util.StringJoiner; ...@@ -35,7 +35,7 @@ import java.util.StringJoiner;
public class KaServiceImpl implements IKaService { public class KaServiceImpl implements IKaService {
@Value("http://localhost:7037") // http://localhost:7037 ${qapi.http} @Value("${qapi.http}") // http://localhost:7037 ${qapi.http}
private String kaSysUrl; private String kaSysUrl;
@Autowired @Autowired
......
...@@ -148,7 +148,7 @@ public class OrderServiceImpl implements IOrderService { ...@@ -148,7 +148,7 @@ public class OrderServiceImpl implements IOrderService {
ApplyRequestHistory applyRequestHistory; ApplyRequestHistory applyRequestHistory;
if (!orderMappingResult.isSuccess() || Objects.isNull(applyRequestHistory = orderMappingResult.getData())) { if (!orderMappingResult.isSuccess() || Objects.isNull(applyRequestHistory = orderMappingResult.getData())) {
log.error("{} 最新渠道进件请求流水失败,不存在进件流水信息 result={} channelOrderNo={},channelId={}", logPre, orderMappingResult, channelOrderNo, channelId); log.error("{} 最新渠道进件请求流水失败,不存在进件流水信息 result={} channelOrderNo={},channelId={}", logPre, orderMappingResult, channelOrderNo, channelId);
return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode()); return JsonResult.buildErrorStateResult("不存在进件流水信息", ErrorCodeEnum.RETURN_ERROR.getCode());
} }
// 存在进件流水,进件失败 // 存在进件流水,进件失败
...@@ -186,7 +186,7 @@ public class OrderServiceImpl implements IOrderService { ...@@ -186,7 +186,7 @@ public class OrderServiceImpl implements IOrderService {
OrderStatus orderStatus; OrderStatus orderStatus;
if (!orderStatusResult.isSuccess()) { if (!orderStatusResult.isSuccess()) {
log.error("{} 查询订单状态 orderStatus 失败 result={} orderQuery={}", logPre, orderStatusResult, orderQuery); log.error("{} 查询订单状态 orderStatus 失败 result={} orderQuery={}", logPre, orderStatusResult, orderQuery);
return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode()); return JsonResult.buildErrorStateResult(orderStatusResult.getMsg(), ErrorCodeEnum.RETURN_ERROR.getCode());
} }
orderStatus = orderStatusResult.getData(); orderStatus = orderStatusResult.getData();
...@@ -195,7 +195,7 @@ public class OrderServiceImpl implements IOrderService { ...@@ -195,7 +195,7 @@ public class OrderServiceImpl implements IOrderService {
JsonResult<List<CallbackRecord>> callbackListResult = queryOrderCallback(orderQuery); JsonResult<List<CallbackRecord>> callbackListResult = queryOrderCallback(orderQuery);
if (!callbackListResult.isSuccess()) { if (!callbackListResult.isSuccess()) {
log.error("{} 查询发送记录失败 result={} orderQuery={}", logPre, callbackListResult, orderQuery); log.error("{} 查询发送记录失败 result={} orderQuery={}", logPre, callbackListResult, orderQuery);
return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode()); return JsonResult.buildErrorStateResult("查询通知记录失败", ErrorCodeEnum.RETURN_ERROR.getCode());
} }
final String defaultStatusStr = "进件成功"; final String defaultStatusStr = "进件成功";
......
...@@ -30,7 +30,7 @@ import java.util.Objects; ...@@ -30,7 +30,7 @@ import java.util.Objects;
@Service("xyqbService") @Service("xyqbService")
public class XyqbServiceImpl implements IXyqbService { public class XyqbServiceImpl implements IXyqbService {
@Value("http://api-ka1.liangkebang.net") //${api.http} @Value("${api.http}") //${api.http}
private String xyqbSysUrl; private String xyqbSysUrl;
...@@ -348,7 +348,7 @@ public class XyqbServiceImpl implements IXyqbService { ...@@ -348,7 +348,7 @@ public class XyqbServiceImpl implements IXyqbService {
}; };
JsonResult<OrderStatusXyqb> jsonResult = JSONTools.deserialize(result, typeToken); JsonResult<OrderStatusXyqb> jsonResult = JSONTools.deserialize(result, typeToken);
if (Objects.isNull(jsonResult) || Objects.isNull(jsonResult.getData())) { if (Objects.isNull(jsonResult) || Objects.isNull(jsonResult.getData())) {
return JsonResult.buildErrorStateResult("查询订单状态失败,反序列化失败", ErrorCodeEnum.RETURN_ERROR); return JsonResult.buildErrorStateResult("查询订单状态失败", ErrorCodeEnum.RETURN_ERROR);
} else { } else {
return JsonResult.buildSuccessResult("查询订单状态成功", jsonResult.getData().getCurrentStatus()); return JsonResult.buildSuccessResult("查询订单状态成功", jsonResult.getData().getCurrentStatus());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment