From 2427b05aeca08ee3c4998843bf749d35440d461b Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 15 六月 2024 21:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderVO.java | 147 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 147 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderVO.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderVO.java
new file mode 100644
index 0000000..16319cd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderVO.java
@@ -0,0 +1,147 @@
+package com.ruoyi.order.controller.management.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
+import com.ruoyi.common.core.enums.BondStatusEnum;
+import com.ruoyi.common.core.enums.OrderFromEnum;
+import com.ruoyi.common.core.enums.OrderStatusEnum;
+import com.ruoyi.common.core.enums.PaymentMethodEnum;
+import com.ruoyi.system.api.domain.vo.Express100VO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+/**
+ * @author mitao
+ * @date 2024/6/12
+ */
+@Data
+@Api(value = "商城订单视图对象")
+public class MgtOrderVO implements Serializable {
+
+ private static final long serialVersionUID = -7047076906373189300L;
+
+ @ApiModelProperty(value = "订单id")
+ private Long id;
+
+ @ApiModelProperty(value = "订单编号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "下单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime orderTime;
+
+ @ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
+ private AuctionOrderTypeEnum auctionType;
+
+ @ApiModelProperty(value = "所属拍卖场")
+ private String salesroomName;
+
+ @ApiModelProperty("拍卖会id")
+ private Long auctionSalesroomId;
+
+ @ApiModelProperty(value = "保证金")
+ private BigDecimal bound;
+
+ @ApiModelProperty(value = "保证金状态 1=待支付 2=已支付 3=已退款")
+ private BondStatusEnum boundStatus;
+
+ @ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
+ private OrderFromEnum orderFrom;
+
+ @ApiModelProperty(value = "会员id")
+ private Long memberId;
+
+ @ApiModelProperty(value = "会员姓名")
+ private String nickname;
+
+ @ApiModelProperty("联系方式")
+ private String phone;
+
+ @ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
+ private PaymentMethodEnum paymentMethod;
+
+ @ApiModelProperty(value = "支付合计")
+ private BigDecimal totalAmount;
+
+ @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消,6 售后")
+ private OrderStatusEnum orderStatus;
+
+ @ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime payTime;
+
+ @ApiModelProperty(value = "取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime cancelTime;
+
+ @ApiModelProperty(value = "订单备注")
+ private String orderRemark;
+
+ @ApiModelProperty(value = "发货时间")
+ private LocalDateTime deliveryTime;
+
+ @ApiModelProperty(value = "确认收货时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime receiveTime;
+
+ @ApiModelProperty(value = "优惠金额")
+ private BigDecimal discountMoney;
+
+ @ApiModelProperty("秒杀价格")
+ private BigDecimal seckillPrice;
+
+ @ApiModelProperty("秒杀价格")
+ private BigDecimal groupPurchasesPrice;
+
+ @ApiModelProperty(value = "商品数量")
+ private Integer goodsQuantity;
+
+ @ApiModelProperty(value = "快递单号")
+ private String courierNumber;
+
+ @ApiModelProperty(value = "收货人姓名")
+ private String receiverName;
+
+ @ApiModelProperty(value = "收货人电话")
+ private String receiverPhone;
+
+ @ApiModelProperty(value = "城市")
+ private String receiverCity;
+
+ @ApiModelProperty(value = "详细地址")
+ private String receiverDetailAddress;
+
+ @ApiModelProperty(value = "开票状态 开票状态 1 待开票，2待审核，3 已开票，4 拒绝")
+ private Integer invoiceStatus;
+
+ @ApiModelProperty(value = "优惠券id")
+ private Long couponId;
+
+ @ApiModelProperty(value = "优惠券名称")
+ private String couponName;
+
+ @ApiModelProperty(value = "商品id")
+ private Long goodsSkuId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String skuName;
+
+ @ApiModelProperty(value = "封面图")
+ private String coverPic;
+
+ @ApiModelProperty(value = "商品价格")
+ private BigDecimal price;
+
+ @ApiModelProperty(value = "积分")
+ private Integer points;
+
+ @ApiModelProperty("售后信息")
+ private MgtOrderReturnRequestVO returnRequestVO;
+
+ @ApiModelProperty("物流信息")
+ private Express100VO express100VO;
+}
--
Gitblit v1.7.1