From 393f18083346304424d05e063ca2c45f1f7ca6eb Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 26 八月 2024 14:19:04 +0800
Subject: [PATCH] 8.26
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java | 29 +++++++++++++++++++++++++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 8 ++++++++
2 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index d9a6601..933b96b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -75,6 +75,14 @@
@Autowired
private AppUserClient appUserClient;
+
+ @ResponseBody
+ @PostMapping(value = "/pay/order/list")
+ @ApiOperation(value = "列表", tags = {"管理后台-支付订单-订单信息"})
+ public R payOrderList(@RequestBody ChargingOrderQuery dto){
+
+ }
+
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
new file mode 100644
index 0000000..618977e
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
@@ -0,0 +1,29 @@
+package com.ruoyi.order.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PayOrderDto {
+ private String id;
+ @ApiModelProperty("1充电订单2购物订单3vip订单4停车订单")
+ private Integer type;
+ @ApiModelProperty("订单编号")
+ private String code;
+ @ApiModelProperty("订单标题")
+ private String title;
+ @ApiModelProperty("手机号")
+ private String phone;
+ @ApiModelProperty("订单子状态[ 1充电订单：0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束 ];" +
+ "[2购物订单：1=待发货，2=待收货，3=已完成，4=已取消]" +
+ "[3vip订单都为支付成功]" +
+ "[4（1=已进场，2=已出场，3=已缴费出场）]")
+ private Integer status;
+ @ApiModelProperty("订单金额")
+ private Double orderAmount;
+ @ApiModelProperty("支付金额")
+ private Double paymentAmount;
+ private java.sql.Timestamp createTime;
+ private java.sql.Timestamp endTime;
+
+}
--
Gitblit v1.7.1