修复用车数据回推出现问题的bug
This commit is contained in:
parent
38f54b1235
commit
fe19500bc6
|
@ -412,6 +412,11 @@ public class RouteOrder implements Serializable {
|
|||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if(leg.getLegType().equals(LEG_TYPE_TAXI)){
|
||||
return false;
|
||||
}
|
||||
|
||||
Location originLocation = leg.getOriginLocation();
|
||||
Location destinationLocation = leg.getDestinationLocation();
|
||||
Long orderDetailOriginId = orderDetail.getOriginId();
|
||||
|
|
|
@ -32,7 +32,7 @@ public class SupplierResponseInterceptor implements HandlerInterceptor {
|
|||
CTripNoteResponse error = CTripNoteResponse.error(result.getMsg());
|
||||
cTripResContent = gson.toJson(error);
|
||||
} else if(result.getCode().equals(RESULT_SUCCESS_CODE)){
|
||||
CTripNoteResponse success = CTripNoteResponse.success(result.getMsg());
|
||||
CTripNoteResponse success = CTripNoteResponse.success(null);
|
||||
cTripResContent = gson.toJson(success);
|
||||
} else {
|
||||
CTripNoteResponse error = CTripNoteResponse.error("未知消息");
|
||||
|
|
|
@ -24,6 +24,7 @@ import com.chint.interfaces.rest.ly.tools.LYOrderUtil;
|
|||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static com.chint.infrastructure.constant.LYConstant.*;
|
||||
|
@ -107,6 +108,10 @@ public class LYCallBackDataHandler {
|
|||
.data(data)
|
||||
.productType(productType);
|
||||
OrderDetail orderDetail = supplierService.handleSupplierCallback(supplierCallbackData);
|
||||
|
||||
if (orderDetail.getOrderEventList() == null) {
|
||||
orderDetail.setOrderEventList(new ArrayList<>());
|
||||
}
|
||||
List<Integer> list = orderDetail
|
||||
.getOrderEventList()
|
||||
.stream()
|
||||
|
|
Loading…
Reference in New Issue