From 2812309093cc6fd31a75d10f62bc52abb7588f56 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 17:16:57 +0800
Subject: [PATCH] feat(mall): 后台活动列表添加分页和搜索功能 - 在 ActivityServiceImpl 中实现 getAdminListInPage 方法，支持分页和搜索 - 在 AdminActivityController 中添加 list 接口，返回分页数据 - 在 IActivityService 中定义 getAdminListInPage 接口 - 更新前端模板，根据活动状态控制按钮显示
---
src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 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 85130e9..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,6 @@
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;
@@ -39,6 +40,12 @@
@ApiModelProperty(value = "订单金额")
private BigDecimal amount;
+ @ApiModelProperty(value = "送货上门经度")
+ private Double longitude;
+
+ @ApiModelProperty(value = "送货上门纬度")
+ private Double latitude;
+
@ApiModelProperty(value = "收货人姓名")
private String name;
@@ -66,6 +73,9 @@
@ApiModelProperty(value = "运费")
private BigDecimal carriage;
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
public Integer getPayMethodType() {
if (this.payMethod == null) {
return 0;
@@ -81,5 +91,41 @@
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