diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/OrderDetailService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/OrderDetailService.java index c4fcec4..4be2379 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/OrderDetailService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/OrderDetailService.java @@ -35,8 +35,6 @@ public interface OrderDetailService extends IService { */ List getListBySaleOrderId(Long saleOrdId); - List getListByOrderId(Long orderId); - List getOrderItemWithOrder(OrderItemWithOrderPagination pagination); diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/OrderDetailServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/OrderDetailServiceImpl.java index aae32a7..82e4c92 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/OrderDetailServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/OrderDetailServiceImpl.java @@ -38,14 +38,6 @@ public class OrderDetailServiceImpl extends ServiceImpl getListByOrderId(Long orderId) { - QueryWrapper query = new QueryWrapper<>(); - query.lambda().eq(OrderDetailEntity::getId, orderId); - query.lambda().orderByDesc(OrderDetailEntity::getCreatorTime); - return this.list(query); - } - @Override public List getOrderItemWithOrder(OrderItemWithOrderPagination pagination) { Page page = new Page<>(pagination.getCurrentPage(), pagination.getPageSize()); diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ExampleOrderController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ExampleOrderController.java index 95523e6..c941900 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ExampleOrderController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ExampleOrderController.java @@ -185,7 +185,7 @@ public class ExampleOrderController { } Map ExampleOrderMap=JsonUtil.entityToMap(entity); ExampleOrderMap.put("id", ExampleOrderMap.get("id")); - List orderDetailList = orderDetailService.getListByOrderId(entity.getId()); + List orderDetailList = orderDetailService.getListBySaleOrderId(entity.getId()); for (OrderDetailEntity orderDetailEntity : orderDetailList) { orderDetailEntity.setUnitName("1".equals(orderDetailEntity.getUnit())?"kg":"T"); } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/OrderDetailController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/OrderDetailController.java index 3628961..64fb71a 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/OrderDetailController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/OrderDetailController.java @@ -71,7 +71,7 @@ public class OrderDetailController { @Parameter(name = "saleOrdId", description = "销售订单ID", required = true) @GetMapping("/byOrder/{saleOrdId}") public ActionResult> getListByOrderId(@PathVariable Long saleOrdId) { - List entityList = orderDetailService.getListByOrderId(saleOrdId); + List entityList = orderDetailService.getListBySaleOrderId(saleOrdId); List voList = JsonUtil.getJsonToList(entityList, OrderDetailVO.class); return ActionResult.success(new ListVO<>(voList)); }