From 86df207c37502cce1b2043e1c7c0486459eef1d6 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期四, 13 三月 2025 19:58:45 +0800 Subject: [PATCH] 党员、诉求评论基础代码 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java index b212837..a1ac37f 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java @@ -1,14 +1,14 @@ package com.panzhihua.common.model.vos.shop; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * @auther cedoo @@ -26,8 +26,14 @@ @ApiModelProperty("店铺id") private Long storeId; + @ApiModelProperty("店铺名称") + private String storeName; + @ApiModelProperty("用户id") private Long userId; + + @ApiModelProperty("用户账号") + private Long userName; @ApiModelProperty("订单号") private String orderNo; @@ -38,7 +44,7 @@ @ApiModelProperty("微信交易单号") private String wxTardeNo; - @ApiModelProperty("订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)") + @ApiModelProperty(value = "订单状态(1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)") private Integer status; @ApiModelProperty("支付状态(1.未支付 2.已支付)") @@ -46,6 +52,15 @@ @ApiModelProperty("订单收货人id") private Long receiverId; + + @ApiModelProperty("收货人") + private String receiverName; + + @ApiModelProperty("电话") + private String receiverPhone; + + @ApiModelProperty("商品") + private String goodsName; @ApiModelProperty("订单总金额") private BigDecimal totalAmount; @@ -79,4 +94,10 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; + @ApiModelProperty("自提点地址") + private String address; + + @ApiModelProperty("自提点名称") + private String pointName; + } \ No newline at end of file -- Gitblit v1.7.1