From 05e1b74b46f283a8841bc284e626e19750ff41b4 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 25 八月 2023 14:31:38 +0800
Subject: [PATCH] 新增积分商城模块（新增商品 编辑商品 删除商品 商品列表） 修改活动人员统计为0 修改小程序活动报名报错
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 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..6d1f54b 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
@@ -68,10 +68,6 @@
@ApiModelProperty(value = "支付单号")
private String payNo;
- @ApiModelProperty(value = "发货时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date deliveryTime;
-
@ApiModelProperty(value = "收货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date receivingTime;
@@ -97,4 +93,46 @@
@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;
+
+ @ApiModelProperty(value = "取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date cancelTime;
+
+ @ApiModelProperty(value = "配送时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date deliveryTime;
+
+ @ApiModelProperty(value = "送达时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date serviceTime;
+
+ @ApiModelProperty(value = "是否可退款按钮显示 1.可退款 2.不可退款")
+ private Integer refundable = 1;
+
+ @ApiModelProperty(value = "微信交易单号")
+ private String wxTardeNo;
}
--
Gitblit v1.7.1