diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java index f3e903c..a596521 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java @@ -161,7 +161,6 @@ public class AdminOrderController { ); List vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(tradeOrderEntities, list, false); - pageUtils.setRows(vvOrderListResps); return R.ok().setData(pageUtils); } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java index 680a7ee..5a03bc6 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java @@ -115,7 +115,7 @@ public class AdminReverseController { vvReverseOrderDTO.setVvReverseOrderProveEntities(vvProveMap.get(vvReverseOrderEntity.getId())); vvReverseOrderDTO.setVvPackageEntity(vvPackageEntityMap.get(vvReverseOrderEntity.getTrackNumber())); - List actionDTOS = AbstractReverseAction.getOrderActionDTO(vvReverseOrderEntity, false); + List actionDTOS = AbstractReverseAction.getOrderActionDTO(vvReverseOrderEntity, false); vvReverseOrderDTO.setOrderActionList(actionDTOS); vvReverseOrderDTOS.add(vvReverseOrderDTO); } @@ -124,6 +124,9 @@ public class AdminReverseController { } + /*** + * 逆向审批 : https://api.1024api.com/api-interface/mm/reverse/list + */ @Describe("后台逆向审批") @RequestMapping("/approve") public R approve(@RequestBody VvApproveRequest vvApproveRequest) {