From 1af77abfa06a1a0d537bb120ae0c362aae9d3b83 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 30 七月 2025 10:14:40 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGetVo.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 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 78bf6c7..8592424 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,8 @@
package com.ruoyi.order.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
+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;
@@ -21,57 +23,87 @@
@ApiModelProperty(value = "订单id")
private String orderId;
- @ApiModelProperty("订单编号")
+ @ApiModelProperty(value="订单编号")
private String orderNo;
+
+ @ApiModelProperty(value="三方订单号")
+ private String tripartiteOrderId;
@ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
private Integer orderStatus;
- @ApiModelProperty("订单来源1.商城2.秒杀活动3.线下创建")
+ @ApiModelProperty(value="订单来源1.商城2.秒杀活动3.线下创建")
private Integer orderFrom;
@ApiModelProperty(value = "商品总价")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderGoodsMoney;
@ApiModelProperty(value = "优惠券抵扣")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal couponDiscount;
- @ApiModelProperty("应收金额")
+ @ApiModelProperty(value="应收金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
- @ApiModelProperty("应收订金")
+ @ApiModelProperty(value="应收订金")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableDeposit;
- @ApiModelProperty("订单商品列表")
+
+ @ApiModelProperty(value="待支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private BigDecimal unpaidMoney;
+
+
+
+ @ApiModelProperty(value="订单商品列表")
private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
- @ApiModelProperty("订单支付金额")
+ @ApiModelProperty(value = "支付方式1.全款2.订金")
+ private Integer payType;
+
+
+ @ApiModelProperty(value="订单支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
- @ApiModelProperty("商户id")
+ @ApiModelProperty(value="商户id")
private Long shopId;
- @ApiModelProperty("商户名称")
+ @ApiModelProperty(value="商户名称")
private String shopName;
@ApiModelProperty(value = "是否绑定商户0否1是")
private Integer sameShop;
- @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="取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cancelTime;
- @ApiModelProperty("订单备注")
+ @ApiModelProperty(value="订单备注")
private String orderRemark;
@ApiModelProperty(value = "核销码")
private String verifyCode;
+
+ @ApiModelProperty(value="结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ @ApiModelProperty(value="取消方（1=平台，2=商户，3=用户）")
+ private Integer cancelType;
}
--
Gitblit v1.7.1