From cf985b57d178fad1e18b46b9b020548a90d3d915 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 十一月 2022 11:17:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java
index 80c8069..43e3076 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java
@@ -97,4 +97,28 @@
@ApiModelProperty(value = "评价")
private ComShopFlowerEvaluateVO comShopFlowerEvaluateVO;
+ @ApiModelProperty(value = "配送单id")
+ private Long deliveryId;
+
+ @ApiModelProperty(value = "配送单号")
+ private String deliveryNo;
+
+ @ApiModelProperty(value = "退款时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date refundTime;
+
+ @ApiModelProperty(value = "退款金额")
+ private BigDecimal refundAmount;
+
+ @ApiModelProperty(value = "规格名称")
+ private String goodsAttrName;
+
+ @ApiModelProperty(value = "购买数量")
+ private Integer amount;
+
+ @ApiModelProperty(value = "商品规格价格")
+ private BigDecimal goodsAttrPrice;
+
+ @ApiModelProperty(value = "商品规格图")
+ private String goodsAttrPic;
}
--
Gitblit v1.7.1