From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期二, 01 四月 2025 16:03:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPlaceOrderVo.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPlaceOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPlaceOrderVo.java index caa8138..ba4d80f 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPlaceOrderVo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPlaceOrderVo.java @@ -2,6 +2,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,13 +26,18 @@ @ApiModelProperty(value = "订单编号") private String orderNo; + @ApiModelProperty(value = "金额为零无需支付 0否1是") + private Integer zeroFlag; + @ApiModelProperty(value = "支付方式1.全款2.订金") private Integer payType; @ApiModelProperty(value = "支付金额") + @JsonSerialize(using = ToStringSerializer.class) private BigDecimal payMoney; @ApiModelProperty(value = "未支付金额") + @JsonSerialize(using = ToStringSerializer.class) private BigDecimal unpaidMoney; @ApiModelProperty(value = "支付截止时间") -- Gitblit v1.7.1