|
@@ -185,9 +185,10 @@ public class UserDeliverOrderController extends BaseApiController {
|
|
|
}
|
|
|
deliverOrderVO.setItems(userDeliverOrderItemVOS);
|
|
|
|
|
|
-
|
|
|
- deliverOrderVO.setDeliverList(
|
|
|
- userDeliverOrderItemService.getDeliverItemList(order.getOrderId(), deliverOrderVO.getItems()));
|
|
|
+ if (!DeliverOrderTypeEnum.CARD.getValue().equals(deliverOrder.getType())) {
|
|
|
+ deliverOrderVO.setDeliverList(
|
|
|
+ userDeliverOrderItemService.getDeliverItemList(order.getOrderId(), deliverOrderVO.getItems()));
|
|
|
+ }
|
|
|
return AjaxResult.success(deliverOrderVO);
|
|
|
}
|
|
|
|