diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java index b3cabb4..f92e64b 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java @@ -11,6 +11,7 @@ import com.aircraft.modules.order.domain.dto.OrderMainPageQueryDTO; import com.aircraft.modules.order.domain.enums.MainOrderStatusEnum; import com.aircraft.modules.order.domain.enums.OrderSettlementStatusEnum; import com.aircraft.modules.order.domain.enums.OrderTaskStatusEnum; +import com.aircraft.modules.order.domain.vo.OrderAllDetailVO; import com.aircraft.modules.order.domain.vo.OrderMainPageQueryVO; import com.aircraft.modules.order.service.IOrderDetailService; import com.aircraft.modules.order.service.IOrderMainService; @@ -172,4 +173,11 @@ public class OrderBiz { attachmentMaterial.setFileFullPath(orderTaskDTO.getPicUrl()); return attachmentMaterial; } + + /** + * 根据订单ID查询详情 + */ + public OrderAllDetailVO queryOrderDetail(Long id) { + return new OrderAllDetailVO(); + } } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java index 15c25d4..7e1047d 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java @@ -5,6 +5,7 @@ import com.aircraft.modules.order.biz.OrderBiz; import com.aircraft.modules.order.domain.dto.AddOrderDTO; import com.aircraft.modules.order.domain.dto.AddOrderTaskDTO; import com.aircraft.modules.order.domain.dto.OrderMainPageQueryDTO; +import com.aircraft.modules.order.domain.vo.OrderAllDetailVO; import com.aircraft.modules.order.domain.vo.OrderMainPageQueryVO; import com.aircraft.utils.PageResult; import com.aircraft.utils.PageUtil; @@ -13,10 +14,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -46,19 +44,28 @@ public class OrderMainController { } @ApiOperation("新增订单") - @GetMapping("/addOrder") + @PostMapping("/addOrder") public ResponseEntity addOrder(AddOrderDTO addOrderDTO) { orderBiz.addOrder(addOrderDTO); return new ResponseEntity<>(HttpStatus.OK); } @ApiOperation("新增订单任务") - @GetMapping("/addOrderTask") + @PostMapping("/addOrderTask") public ResponseEntity addOrderTask(AddOrderTaskDTO orderTaskDTO) { orderBiz.addOrderTask(orderTaskDTO); return new ResponseEntity<>(HttpStatus.OK); } + /** + * 根据订单ID查询详情 + */ + @ApiOperation("根据订单ID查询详情") + @GetMapping("/queryOrderDetail/{id}") + public ResponseEntity queryOrderDetail(@PathVariable("id") Long id) { + return ResponseEntity.ok(orderBiz.queryOrderDetail(id)); + } + @ApiOperation("用户端关联订单") @PostMapping("/relevanceOrder") public ResponseEntity relevanceOrder(@ApiParam(value = "订单编号", required = true, example = "JS2025071300001")String orderNO) { diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/AddOrderTaskDTO.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/AddOrderTaskDTO.java index ac4621b..5fac2b0 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/AddOrderTaskDTO.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/AddOrderTaskDTO.java @@ -21,7 +21,7 @@ public class AddOrderTaskDTO { * 订单ID */ @NotNull(message = "订单ID不能为空") - @ApiModelProperty(value = "订单ID", required = true, example = "订单列表返回的ID") + @ApiModelProperty(value = "订单ID", required = true) private Long orderId; /** diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderAllDetailVO.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderAllDetailVO.java new file mode 100644 index 0000000..f0c9023 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderAllDetailVO.java @@ -0,0 +1,105 @@ +package com.aircraft.modules.order.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 获取订单详情VO + * + * @author chenxiky + * @version 1.0.0 + * @since 2025/7/16 + */ +@Data +public class OrderAllDetailVO { + + /** + * 订单ID + */ + @ApiModelProperty(value = "ID") + private Long id; + + /** + * 订单编号 + */ + @ApiModelProperty(value = "订单编号") + private String orderNo; + + /** + * 订单类型 + */ + @ApiModelProperty(value = "订单类型") + private String orderType; + + /** + * 订单发起人 + */ + @ApiModelProperty(value = "订单发起人") + private String orderInitiator; + + /** + * 客户名称 + */ + @ApiModelProperty(value = "客户名称") + private String customerName; + + /** + * 手机号码 + */ + @ApiModelProperty(value = "客户手机号码") + private String phone; + + /** + * 发起人手机号码 + */ + @ApiModelProperty(value = "发起人手机号码") + private String initiatorPhone; + + /** + * 景区 + */ + @ApiModelProperty(value = "景区名称") + private String scenicName; + + /** + * 路线,多个用逗号隔开返回 + */ + @ApiModelProperty(value = "路线名称,多个用逗号隔开返回", example = "线路1,线路2") + private String routeName; + + /** + * 货物重量 + */ + @ApiModelProperty(value = "货物重量") + private BigDecimal cargoWeight; + + /** + * 附加费 + */ + @ApiModelProperty(value = "附加费") + private BigDecimal additionalFee; + + /** + * 操作员,多个逗号拼接返回 + */ + @ApiModelProperty(value = "操作员,多个逗号拼接返回", example = "操作员1,操作员2") + private String operatorName; + + /** + * 下单时间 + */ + @ApiModelProperty(value = "下单时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date orderTime; + + /** + * 订单子单信息列表 + */ + private List orderTaskDetailList; + +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderTaskDetailVO.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderTaskDetailVO.java new file mode 100644 index 0000000..2db93bb --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderTaskDetailVO.java @@ -0,0 +1,55 @@ +package com.aircraft.modules.order.domain.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * + * 订单详情VO + * + * @author chenxiky + * @version 1.0.0 + * @since 2025/7/16 + */ +@Data +public class OrderTaskDetailVO { + + /** + * ID + */ + @ApiModelProperty(value = "ID") + private Long id; + + /** + * 图片Url + */ + @ApiModelProperty(value = "图片Url") + private String imageUrl; + + /** + * 设备名称 + */ + @ApiModelProperty(value = "设备名称") + private String deviceName; + + /** + * 载物重量 + */ + @ApiModelProperty(value = "载物重量") + private BigDecimal cargoWeight; + + /** + * 操作员 + */ + @ApiModelProperty(value = "操作员") + private String operatorName; + + /** + * 任务状态 + */ + @ApiModelProperty(value = "任务状态") + private String orderItemStatus; + +}