From 61cc9037a887812963ea0f99b020e296a6268184 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sun, 27 Apr 2025 13:41:11 +0800
Subject: [PATCH] feat(mall): 增加活动热度排序功能并更新相关配置
---
src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java | 74 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
index f18c329..538eb5d 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
@@ -1,5 +1,7 @@
package cc.mrbird.febs.mall.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,16 +25,26 @@
private String orderNo;
@ApiModelProperty(value = "下单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date orderTime;
@ApiModelProperty(value = "支付方式")
private String payMethod;
+
+ @ApiModelProperty(value = "支付方式类型")
+ private Integer payMethodType;
@ApiModelProperty(value = "状态")
private Integer status;
@ApiModelProperty(value = "订单金额")
private BigDecimal amount;
+
+ @ApiModelProperty(value = "送货上门经度")
+ private Double longitude;
+
+ @ApiModelProperty(value = "送货上门纬度")
+ private Double latitude;
@ApiModelProperty(value = "收货人姓名")
private String name;
@@ -54,4 +66,66 @@
@ApiModelProperty(value = "订单退款信息")
private OrderRefundVo orderRefund;
+
+ @ApiModelProperty(value = "剩余时间")
+ private Long remainTime;
+
+ @ApiModelProperty(value = "运费")
+ private BigDecimal carriage;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ public Integer getPayMethodType() {
+ if (this.payMethod == null) {
+ return 0;
+ }
+ switch (this.payMethod) {
+ case "微信支付" :
+ return 1;
+ case "支付宝支付" :
+ return 2;
+ case "积分支付" :
+ return 3;
+ default:
+ return 3;
+ }
+ }
+
+ @ApiModelProperty(value = "评价状态 1：待评价 2：已评价")
+ private Integer commentState;
+ //提货码
+ @ApiModelProperty(value = "提货码")
+ private String takeCode;
+ /**
+ * 自提点信息
+ */
+ @ApiModelProperty(value = "团长姓名")
+ private String leaderName;
+ @ApiModelProperty(value = "团长电话")
+ private String leaderPhone;
+ @ApiModelProperty(value = "自提点图片")
+ private String addressPic;
+ @ApiModelProperty(value = "自提点省")
+ private String province;
+ @ApiModelProperty(value = "自提点市")
+ private String city;
+ @ApiModelProperty(value = "自提点区")
+ private String township;
+ @ApiModelProperty(value = "自提点名称")
+ private String addressArea;
+ @ApiModelProperty(value = "自提点详细地址")
+ private String detailAddress;
+ @ApiModelProperty(value = "自提点经度")
+ private Double leaderLongitude;
+ @ApiModelProperty(value = "自提点纬度")
+ private Double leaderLatitude;
+ @ApiModelProperty(value = "配送状态 1：待配送 2：配送中 3：已送达")
+ private Integer deliveryState;
+ @ApiModelProperty(value = "是否送货上门 1：是 2：否")
+ private Integer isHome;
+
+ @ApiModelProperty(value = "是否赠送 1-是 2-否")
+ private Integer isFree;
}
+
--
Gitblit v1.9.1