From a8e56f03a22c722ccf3f67a408919e6c8f256de3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 10 八月 2023 01:45:01 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
index 0cda36b..f8e0f1a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -31,21 +33,26 @@
private Integer orderFrom;
@ApiModelProperty(value = "商品总价")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderGoodsMoney;
@ApiModelProperty(value = "优惠券抵扣")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal couponDiscount;
@ApiModelProperty(value="应收金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
@ApiModelProperty(value="应收订金")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableDeposit;
@ApiModelProperty(value="订单商品列表")
private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
@ApiModelProperty(value="订单支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
@ApiModelProperty(value="创建时间")
@@ -72,6 +79,21 @@
@ApiModelProperty(value = "用户电话")
private String userMobile;
+ @ApiModelProperty(value="实收金额")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private BigDecimal realReceiveMoney;
+
+ @ApiModelProperty(value="已收金额")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private BigDecimal receiveMoney;
+
+ @ApiModelProperty(value="未收金额")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private BigDecimal unReceiveMoney;
+
+ @ApiModelProperty(value="支付方式1.全款2订金")
+ private Integer payType;
+
@ApiModelProperty(value="结清标记0否1是")
private Integer closeFlag;
}
--
Gitblit v1.7.1