From be2e00346362a9a3ff4f1a46de134639c73953ed Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 15 七月 2025 14:11:55 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 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 77c99ca..06adc1b 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,5 +1,6 @@
package com.ruoyi.order.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,48 +21,80 @@
@ApiModelProperty(value = "订单id")
private String orderId;
- @ApiModelProperty("订单编号")
+ @ApiModelProperty(value="订单编号")
private String orderNo;
@ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
private Integer orderStatus;
- @ApiModelProperty("订单来源1.商城2.秒杀活动3.线下创建")
+ @ApiModelProperty(value = "订单来源1.商城2.秒杀活动3.线下创建4.抽奖5.美团6.抖音7.快手")
private Integer orderFrom;
@ApiModelProperty(value = "商品总价")
+
private BigDecimal orderGoodsMoney;
@ApiModelProperty(value = "优惠券抵扣")
+
private BigDecimal couponDiscount;
- @ApiModelProperty("应收金额")
+ @ApiModelProperty(value="应收金额")
+
private BigDecimal receivableMoney;
- @ApiModelProperty("应收订金")
+ @ApiModelProperty(value="应收订金")
+
private BigDecimal receivableDeposit;
- @ApiModelProperty("订单商品列表")
+ @ApiModelProperty(value="订单商品列表")
private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
- @ApiModelProperty("订单支付金额")
+ @ApiModelProperty(value="订单支付金额")
+
private BigDecimal payMoney;
- @ApiModelProperty("创建时间")
+ @ApiModelProperty(value="创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @ApiModelProperty("支付时间")
+ @ApiModelProperty(value="支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime;
- @ApiModelProperty("核销时间")
+ @ApiModelProperty(value="核销时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date useTime;
- @ApiModelProperty("订单备注")
+ @ApiModelProperty(value="订单备注")
private String orderRemark;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
@ApiModelProperty(value = "用户姓名")
private String userName;
-
+
@ApiModelProperty(value = "用户电话")
private String userMobile;
+
+ @ApiModelProperty(value = "实收金额")
+
+ private BigDecimal realReceiveMoney;
+
+ @ApiModelProperty(value = "已收金额")
+
+ private BigDecimal receiveMoney;
+
+ @ApiModelProperty(value = "未收金额")
+
+ private BigDecimal unReceiveMoney;
+
+ @ApiModelProperty(value = "支付方式1.全款2订金")
+ private Integer payType;
+
+ @ApiModelProperty(value = "结清标记0否1是")
+ private Integer closeFlag;
+
+ @ApiModelProperty(value = "剩余可核销次数")
+ private Integer laveTime;
}
--
Gitblit v1.7.1