From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java
index 19fbdec..791eac6 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.api.domain.vo;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
@@ -12,64 +13,90 @@
@Data
public class MemberTiOrderVO {
@ApiModelProperty(value = "订单id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long id;
@ApiModelProperty(value = "订单编号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String orderNo;
@ApiModelProperty(value = "商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long goodsSkuId;
@ApiModelProperty(value = "下单时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime orderTime;
@ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private OrderFromEnum orderFrom;
@ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private AuctionOrderTypeEnum auctionType;
@ApiModelProperty(value = "会员id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long memberId;
@ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private PaymentMethodEnum paymentMethod;
@ApiModelProperty(value = "支付合计")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal totalAmount;
@ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private OrderStatusEnum orderStatus;
@ApiModelProperty(value = "优惠金额")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal discountMoney;
@ApiModelProperty(value = "商品数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer goodsQuantity;
@ApiModelProperty(value = "收货人姓名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String receiverName;
@ApiModelProperty(value = "收货人电话")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String receiverphone;
@ApiModelProperty(value = "城市")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String receiverCity;
@ApiModelProperty(value = "详细地址")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String receiverDetailAddress;
@ApiModelProperty(value = "商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal price;
@ApiModelProperty(value = "优惠的价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal youhiPrice;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String skuName;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
+
+ @ApiModelProperty(value = "实际商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private BigDecimal sjPrice;
+
+
}
--
Gitblit v1.7.1