From f10a7c29f1a3748b28d2809335625c7888473b26 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 22 九月 2025 22:21:19 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java
index afc33b3..730bcbc 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java
@@ -15,13 +15,25 @@
*/
@Data
public class MerVerifyOrderDto extends MerBaseDto {
-
+
@ApiModelProperty(value = "订单id")
private String orderId;
+ @ApiModelProperty(value = "核销用户电话号码")
+ private String phone;
+
+ @ApiModelProperty(value = "核销用户姓名")
+ private String name;
+
@ApiModelProperty(value = "实收金额")
private BigDecimal relReceiveMoney;
-
- @ApiModelProperty(value = "实收金额")
+
+ @ApiModelProperty(value = "实付金额")
private BigDecimal relPayMoney;
+
+ @ApiModelProperty(value = "支付方式1微信2现金3支付宝")
+ private Integer payType;
+
+ @ApiModelProperty(value = "核销数量")
+ private Integer number;
}
--
Gitblit v1.7.1