From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 09 六月 2025 11:54:00 +0800 Subject: [PATCH] 6.9新增登录失败冻结逻辑 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java index 47fff42..58286a3 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java @@ -31,7 +31,7 @@ @ApiModelProperty(value = "下单人id") private String userId; - @ApiModelProperty(value = "核销状态(0待核销 1已核销)") + @ApiModelProperty(value = "核销状态(0待核销 1已核销 2订单已取消)") private String cancelType; @ApiModelProperty(value = "核销时间") @@ -49,6 +49,11 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; + @ApiModelProperty(value = "取消时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date abolishTime; + + @ApiModelProperty(value = "商品名称") private String goodName; @@ -64,4 +69,25 @@ @ApiModelProperty(value = "电话") private String phone; + + @ApiModelProperty(value = "兑换地址") + private String address; + + @ApiModelProperty(value = "纬度") + private String lat; + + @ApiModelProperty(value = "经度") + private String lng; + + @ApiModelProperty(value = "兑换状态(1每天 2周一到周五 3周末)") + private String businessType; + + @ApiModelProperty(value = "兑换开始时间") + private String businessStartTime; + + @ApiModelProperty(value = "兑换结束时间") + private String businessEndTime; + + + } -- Gitblit v1.7.1