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/ComShopFlowerRefundOrderVO.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerRefundOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerRefundOrderVO.java
index 3d6b87f..64a338d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerRefundOrderVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerRefundOrderVO.java
@@ -1,10 +1,13 @@
package com.panzhihua.common.model.vos.shop;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @ClassName: ComShopFlowerRefundOrderVO
@@ -52,9 +55,9 @@
private String refundOrderNo;
/**
- * 订单状态(1.处理中 2.退款成功 3.退款失败 4.已取消 5.退款中)
+ * 订单状态(9.处理中 10.退款成功 11.退款失败 12.已取消 13.退款中)
*/
- @ApiModelProperty("订单状态(1.处理中 2.退款成功 3.退款失败 4.已取消 5.退款中)")
+ @ApiModelProperty("订单状态(9.处理中 10.退款成功 11.退款失败 12.已取消 13.退款中)")
private Integer status;
/**
@@ -91,25 +94,36 @@
* 申请时间
*/
@ApiModelProperty("申请时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
/**
* 修改时间
*/
@ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateAt;
/**
* 处理时间
*/
@ApiModelProperty("处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date handleTime;
/**
* 退款时间
*/
@ApiModelProperty("退款时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date refundTime;
+
+ /**
+ * 取消时间
+ */
+ @ApiModelProperty("取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date cancelTime;
/**
* 处理结果
@@ -122,4 +136,16 @@
*/
@ApiModelProperty("商家备注")
private String remark;
+
+ @ApiModelProperty(value = "订单下店铺信息")
+ private ConvenientMerchantVO convenientMerchantVO;
+
+ @ApiModelProperty(value = "订单下商品信息")
+ private List<ComShopFlowerOrderGoodsVO> orderGoodsVOList;
+
+ /**
+ * 商品名称
+ */
+ @ApiModelProperty("商品名称")
+ private String goodsName;
}
--
Gitblit v1.7.1