bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单查询接口代码提交

This commit is contained in:
liang.chao 2024-11-27 10:06:53 +08:00
parent aa464f1a45
commit b176256ed3
5 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
View File

@ -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));
}
}

9
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
View File

@ -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;

6
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
View File

@ -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<OrderDetailDto> detailsList;

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
View File

@ -63,9 +63,9 @@ public class OrderServiceImpl implements OrderService {
@Override
public List<OrderInfoDto> getOrderDetails(OrderInfoDto orderInfoDto) {
List<OrderDetailDto> list = new ArrayList();
List<OrderInfoDto> orderInfoDtos = orderMapper.getOrderDetails(orderInfoDto);
for (OrderInfoDto dto : orderInfoDtos) {
List<OrderDetailDto> list = new ArrayList();
String ids = dto.getIds();
for (String id : ids.split(",")) {
OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(id);

7
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
View File

@ -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}
</select>
</mapper>