From b176256ed31e3a31a0e0836bdeec4c9f1e8edd15 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 27 Nov 2024 10:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/order/controller/OrderController.java | 6 ++++-- .../com/bonus/material/order/domain/OrderDetailDto.java | 9 +++++++++ .../com/bonus/material/order/domain/OrderInfoDto.java | 6 ++++++ .../material/order/service/impl/OrderServiceImpl.java | 2 +- .../resources/mapper/material/order/OrderInfoMapper.xml | 7 +++++-- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 138a569..ca20a39 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -2,6 +2,7 @@ package com.bonus.material.order.controller; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.material.book.domain.BookCarInfoDto; import com.bonus.material.order.domain.OrderDetailDto; import com.bonus.material.order.domain.OrderInfoDto; @@ -45,7 +46,8 @@ public class OrderController extends BaseController { */ @ApiOperation(value = "获取订单详情") @GetMapping("/getOrderDetails") - public AjaxResult getOrderDetails(OrderInfoDto orderInfoDto) { - return AjaxResult.success(orderService.getOrderDetails(orderInfoDto)); + public TableDataInfo getOrderDetails(OrderInfoDto orderInfoDto) { + startPage(); + return getDataTable(orderService.getOrderDetails(orderInfoDto)); } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java index 56f8dd6..7f78452 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java @@ -43,6 +43,15 @@ public class OrderDetailDto { @ApiModelProperty(value = "设备类型（0：编码 1：数量）") private String manageType; + @ApiModelProperty(value = "设备名称") + private String deviceName; + + @ApiModelProperty(value = "日租金") + private BigDecimal dayLeasePrice; + + @ApiModelProperty(value = "订单状态") + private String orderStatus; + @ApiModelProperty(value = "创建日期") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java index c957bf5..1ac9832 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java @@ -1,5 +1,6 @@ package com.bonus.material.order.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,12 +24,15 @@ public class OrderInfoDto { private String code; @ApiModelProperty(value = "订单日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date orderTime; @ApiModelProperty(value = "开始日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; @ApiModelProperty(value = "结束日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; @ApiModelProperty(value = "订单金额") @@ -50,12 +54,14 @@ public class OrderInfoDto { private Long creater; @ApiModelProperty(value = "创建日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; @ApiModelProperty(value = "修改人") private Long updater; @ApiModelProperty(value = "修改日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; private List detailsList; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index d836b79..d64b99e 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -63,9 +63,9 @@ public class OrderServiceImpl implements OrderService { @Override public List getOrderDetails(OrderInfoDto orderInfoDto) { - List list = new ArrayList(); List orderInfoDtos = orderMapper.getOrderDetails(orderInfoDto); for (OrderInfoDto dto : orderInfoDtos) { + List list = new ArrayList(); String ids = dto.getIds(); for (String id : ids.split(",")) { OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(id); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index 2a6b53f..8f9da8e 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -106,15 +106,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mdi.day_lease_price, moi.order_status, hh.days, + bfi.url, hh.num, hh.costs, hh.rent_begin_time, hh.rent_end_time FROM ma_order_details hh - LEFT JOIN ma_order_info moi on hh.order_id = moi.order_id + LEFT JOIN ma_order_info moi ON hh.order_id = moi.order_id LEFT JOIN ma_dev_info mdi ON hh.ma_id = mdi.ma_id + LEFT JOIN bm_file_info bfi ON hh.ma_id = bfi.model_id + AND bfi.file_type = 0 WHERE - id = 1 + hh.id = #{id} \ No newline at end of file