From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java
index 6310677..51c117f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java
@@ -14,7 +14,7 @@
*/
@Data
@ApiModel("便民服自提点")
-public class ConvenientElevatingPointVO {
+public class ConvenientElevatingPointVO implements Comparable<ConvenientElevatingPointVO>{
/**
* 主键id
*/
@@ -92,4 +92,24 @@
*/
@ApiModelProperty("距离手机定位距离")
private Double distance;
+
+ /**
+ * 配送订单数量
+ */
+ @ApiModelProperty(value = "配送订单数量")
+ private Integer deliveryOrderNum;
+
+ /**
+ * 配送商品数量
+ */
+ @ApiModelProperty(value = "配送商品数量")
+ private Integer deliveryGoodsNum;
+
+ @ApiModelProperty(value = "提货点详细地址")
+ private String detailAddress;
+
+ @Override
+ public int compareTo(ConvenientElevatingPointVO o) {
+ return this.getDistance().compareTo(o.getDistance()); //定义你自己的排序规则
+ }
}
--
Gitblit v1.7.1