diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/bussiness/OrderDetailMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/bussiness/OrderDetailMapper.xml index 0f85172..2e3e0bf 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/bussiness/OrderDetailMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/bussiness/OrderDetailMapper.xml @@ -61,4 +61,52 @@ ORDER BY eo.ord_date DESC, od.id DESC + + + diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/OrderDetailMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/OrderDetailMapper.java index ddfa55c..6755961 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/OrderDetailMapper.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/OrderDetailMapper.java @@ -21,5 +21,7 @@ public interface OrderDetailMapper extends BaseMapper { List getOrderItemWithOrder(Page page, @Param("pagination") OrderItemWithOrderPagination pagination); + List getOrderItemWithOrderByIds(@Param("orderIds") List orderIds); + } 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 f04fc2d..f9360d5 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 @@ -37,4 +37,6 @@ public interface OrderDetailService extends IService { List getOrderItemWithOrder(OrderItemWithOrderPagination pagination); + List getOrderItemWithOrderByIds(List orderIds); + } 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 8747534..c5309ed 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 @@ -44,4 +44,9 @@ public class OrderDetailServiceImpl extends ServiceImpl getOrderItemWithOrderByIds(List orderIds) { + return this.baseMapper.getOrderItemWithOrderByIds(orderIds); + } } 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 abbaae8..08ee177 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 @@ -76,6 +76,13 @@ public class OrderDetailController { return ActionResult.success(new ListVO<>(voList)); } + @Operation(summary = "根据订单ID列表查询订单明细(不分页)") + @PostMapping("/getOrderItemWithOrderByIds") + public ActionResult> getOrderItemWithOrderByIds(@RequestBody List orderIds) { + List voList = orderDetailService.getOrderItemWithOrderByIds(orderIds); + return ActionResult.success(new ListVO<>(voList)); + } + /** * 获取信息 * diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/OrderItemWithOrderPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/OrderItemWithOrderPagination.java index 18c8e0b..8261cfb 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/OrderItemWithOrderPagination.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/OrderItemWithOrderPagination.java @@ -5,6 +5,7 @@ import jnpf.base.Pagination; import lombok.Data; import java.util.Date; +import java.util.List; @Data public class OrderItemWithOrderPagination extends Pagination { @@ -24,4 +25,6 @@ public class OrderItemWithOrderPagination extends Pagination { @Schema(description = "行状态") private String ordItemStatus; + private List orderIds; + } diff --git a/jnpf-java-boot/jnpf-web/src/router/modules/base.js b/jnpf-java-boot/jnpf-web/src/router/modules/base.js index d00f9ed..fdb2d7c 100644 --- a/jnpf-java-boot/jnpf-web/src/router/modules/base.js +++ b/jnpf-java-boot/jnpf-web/src/router/modules/base.js @@ -76,6 +76,17 @@ const baseRouter = [{ icon: 'icon-ym icon-ym-generator-link', } }, +{ + path: '/example/tsoorder/generate', + component: (resolve) => require(['@/views/example/tsoorder/generate'], resolve), + name: 'tsoorderGenerate', + meta: { + title: 'tsoorderGenerate', + affix: false, + zhTitle: '生成订单', + icon: 'icon-ym icon-ym-btn-add', + } +}, ] export default baseRouter \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/generate/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/generate/index.vue new file mode 100644 index 0000000..e677ee5 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/generate/index.vue @@ -0,0 +1,491 @@ + + + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/index.vue index da876d2..c2ef529 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/index.vue @@ -56,6 +56,14 @@ > 重置 + + 生成订单 + @@ -65,7 +73,8 @@
- + +