修改审核bug
This commit is contained in:
@@ -157,11 +157,13 @@ public class CreateLock {
|
||||
}
|
||||
|
||||
public List<OrderStatusVo> getOrderStatus(String thirdOrderId, String orderId) {
|
||||
OrderStatusReqVo orderStatusReqVo = new OrderStatusReqVo();
|
||||
orderStatusReqVo.setOrderId(orderId);
|
||||
List<OrderStatusVo> orderList = orderStatusDao.loadList(orderStatusReqVo, OrderStatusVo.class);
|
||||
if (!orderList.isEmpty()) {
|
||||
return orderList;
|
||||
if(!StringHelper.isEmpty(orderId)){
|
||||
OrderStatusReqVo orderStatusReqVo = new OrderStatusReqVo();
|
||||
orderStatusReqVo.setOrderId(orderId);
|
||||
List<OrderStatusVo> orderList = orderStatusDao.loadList(orderStatusReqVo, OrderStatusVo.class);
|
||||
if (!orderList.isEmpty()) {
|
||||
return orderList;
|
||||
}
|
||||
}
|
||||
OrderStatusReqVo orderStatusReqVo1 = new OrderStatusReqVo();
|
||||
// todo: 必须同时包含胖丁ID和第三方ID ????
|
||||
|
||||
@@ -65,7 +65,8 @@ public class OrderReturnSyncHandleTourist implements OrderReturnSyncHandle {
|
||||
}
|
||||
}
|
||||
if(StringHelper.isEmpty(orderTouristVoList)){
|
||||
throw new CodecException("游客信息为空!");
|
||||
return;
|
||||
// throw new CodecException("游客信息为空!");
|
||||
}
|
||||
for (OrderTouristVo orderTouristVo : orderTouristVoList) {
|
||||
orderTouristVo.setOrderId(order.getId());
|
||||
|
||||
Reference in New Issue
Block a user