From 49e88798dcea0164f77c59f0be9eefdf67a3d228 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 七月 2024 15:03:10 +0800
Subject: [PATCH] 2.0bug修改
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/TravelRecordWarpper.java | 101 +++++---------------------------------------------
1 files changed, 10 insertions(+), 91 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/TravelRecordWarpper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/TravelRecordWarpper.java
index 073f84f..7856516 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/TravelRecordWarpper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/TravelRecordWarpper.java
@@ -2,100 +2,19 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import java.util.Map;
/**
- * 个人中心消费记录列表
+ * @author zhibing.pu
+ * @Date 2024/4/19 16:08
*/
-@ApiModel("消费记录")
-public class TravelRecordWarpper implements Comparable {
- @ApiModelProperty("金额")
- private Double money;
- @ApiModelProperty("时间")
- private String time;
- @ApiModelProperty("订单名称")
- private String name;
- private Long insertTime;
-
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public String getTime() {
- return time;
- }
-
- public void setTime(String time) {
- this.time = time;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Long getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Long insertTime) {
- this.insertTime = insertTime;
- }
-
- @Override
- public String toString() {
- return "TravelRecordWarpper{" +
- "money=" + money +
- ", time='" + time + '\'' +
- ", name='" + name + '\'' +
- ", insertTime=" + insertTime +
- '}';
- }
-
-
- public static List<TravelRecordWarpper> getTravelRecordWarpper(List<Map<String, Object>> maps){
- List<TravelRecordWarpper> list = new ArrayList<>();
- if(null != maps){
- for(Map<String, Object> map : maps){
- TravelRecordWarpper travelRecordWarpper = new TravelRecordWarpper();
- travelRecordWarpper.setMoney(null != map.get("money") ? Double.valueOf(String.valueOf(map.get("money"))) : 0);
- travelRecordWarpper.setTime(null != map.get("time") ? String.valueOf(map.get("time")) : "");
- travelRecordWarpper.setName(null != map.get("name") ? String.valueOf(map.get("name")) : "");
- travelRecordWarpper.setInsertTime(null != map.get("insertTime") ? Long.valueOf(String.valueOf(map.get("insertTime"))) : 0);
- list.add(travelRecordWarpper);
- }
- }
- Collections.sort(list);
- return list;
- }
-
- @Override
- public int compareTo(Object o) {
- if (o instanceof TravelRecordWarpper) {
- TravelRecordWarpper s = (TravelRecordWarpper) o;
- if(this.insertTime == null || s.insertTime == null){
- return -1;
- }
- if (this.insertTime > s.insertTime) {
- return -1;
- } else if (this.insertTime == s.insertTime) {
- return 0;
- } else {
- return 1;
- }
- }
- return 0;
- }
+@Data
+@ApiModel
+public class TravelRecordWarpper {
+ @ApiModelProperty("已使用总额")
+ private Double total;
+ @ApiModelProperty("使用列表")
+ private List<TravelRecordListWarpper> list;
}
--
Gitblit v1.7.1