From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java
index 0269775..3441c54 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java
@@ -33,6 +33,9 @@
private String day;
@ApiModelProperty("其他内容")
private Object data;
+
+ @ApiModelProperty("类型（1=活动收入，2=跑单收入，3=取消订单收入，4=改派订单收入，5=优惠券补贴，6=折扣不贴，7=红包补贴）")
+ private Integer type;
public BaseWarpper() {
this.id = 0;
@@ -125,7 +128,15 @@
public void setData(Object data) {
this.data = data;
}
-
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
@Override
public String toString() {
return "BaseWarpper{" +
@@ -155,6 +166,7 @@
baseWarpper.setLat(null != map.get("lat") ? Double.valueOf(map.get("lat").toString()) : 0.0);
baseWarpper.setDay(null != map.get("day") ? map.get("day").toString() : "");
baseWarpper.setData(null != map.get("data") ? map.get("data") : new Object());
+ baseWarpper.setType(null != map.get("type") ? Integer.valueOf(map.get("type").toString()) : 0);
}
return baseWarpper;
}
--
Gitblit v1.7.1