From 6ab383249b70a9646ffde1474b59dcc7d0b97df6 Mon Sep 17 00:00:00 2001 From: jiangqs <343695869@qq.com> Date: 星期日, 06 八月 2023 15:05:15 +0800 Subject: [PATCH] bug --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGetVo.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGetVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGetVo.java index 6e0f3ab..f889c66 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGetVo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGetVo.java @@ -1,6 +1,5 @@ package com.ruoyi.order.domain.vo; -import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -43,8 +42,18 @@ @ApiModelProperty(value="应收订金") private BigDecimal receivableDeposit; + + @ApiModelProperty(value="待支付金额") + private BigDecimal unpaidMoney; + + + @ApiModelProperty(value="订单商品列表") private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList; + + @ApiModelProperty(value = "支付方式1.全款2.订金") + private Integer payType; + @ApiModelProperty(value="订单支付金额") private BigDecimal payMoney; @@ -79,4 +88,8 @@ @ApiModelProperty(value = "核销码") private String verifyCode; + + @ApiModelProperty(value="结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; } -- Gitblit v1.7.1