From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期五, 04 七月 2025 20:39:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 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 bbddb84..7572692 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,10 +15,19 @@ */ @Data public class MerVerifyOrderDto extends MerBaseDto { - + @ApiModelProperty(value = "订单id") private String orderId; - + + @ApiModelProperty(value = "核销用户电话号码") + private String phone; + @ApiModelProperty(value = "实收金额") private BigDecimal relReceiveMoney; + + @ApiModelProperty(value = "实付金额") + private BigDecimal relPayMoney; + + @ApiModelProperty(value = "支付方式1微信2现金3支付宝") + private Integer payType; } -- Gitblit v1.7.1