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/MerMemberOrderVo.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java
index 3f757c8..5271477 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java
@@ -1,8 +1,6 @@
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;
@@ -25,35 +23,37 @@
@ApiModelProperty(value="订单编号")
private String orderNo;
+ @ApiModelProperty(value="支付方式1全款2订金")
+ private Integer payType;
+
+
@ApiModelProperty(value="订单状态")
private Integer orderStatus;
@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="实收金额")
- @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty(value="应收金额")
private BigDecimal receiveMoney;
+ @ApiModelProperty(value="实收金额")
+ private BigDecimal relReceiveMoney;
+
@ApiModelProperty(value="已收金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
private BigDecimal payMoney;
@ApiModelProperty(value="未收金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
private BigDecimal unPaidMoney;
@ApiModelProperty(value="收款时间")
@@ -61,7 +61,6 @@
private Date receiveMoneyTime;
@ApiModelProperty(value="收款金额")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal thisReceiveMoney;
@ApiModelProperty(value="收款方式")
--
Gitblit v1.7.1