From cf1d0fdbdbfe969500508ae9c0fa51cc37d06577 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 06 六月 2023 12:08:17 +0800
Subject: [PATCH] 代理商修改,分公司修改列表
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderListWarpper.java | 231 ++++-----------------------------------------------------
1 files changed, 16 insertions(+), 215 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderListWarpper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderListWarpper.java
index d704bdf..b2b0c34 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderListWarpper.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderListWarpper.java
@@ -2,226 +2,27 @@
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;
-
-@ApiModel("订单列表")
-public class OrderListWarpper implements Comparable {
+/**
+ * @author zhibing.pu
+ * @date 2023/3/18 10:22
+ */
+@Data
+@ApiModel
+public class OrderListWarpper {
@ApiModelProperty("订单id")
private Integer id;
- @ApiModelProperty("订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）")
- private Integer type;
- @ApiModelProperty("订单名称")
- private String name;
+ @ApiModelProperty("标题")
+ private String title;
@ApiModelProperty("订单时间")
- private String time;
- @ApiModelProperty("出发地")
+ private Long createTime;
+ @ApiModelProperty("金额")
+ private Double amount;
+ @ApiModelProperty("起点地址")
private String startAddress;
- @ApiModelProperty("目的地")
+ @ApiModelProperty("终点地址")
private String endAddress;
- @ApiModelProperty("红包金额")
- private Double redMoney;
- @ApiModelProperty("订单金额")
- private Double orderMoney;
- @ApiModelProperty("订单状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中)<br/>" +
- "小件物流订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=已支付差价）")
+ @ApiModelProperty("订单状态（101=待接单，102=已接单，103=前往预约点，104=到达预约点，105=开始服务，106=到达目的地，107=待支付，108=待评价，109=已完成，201=转单中，301=已取消，401=等待中）")
private Integer state;
- @ApiModelProperty("人数")
- private Integer peopleNumber;
- @ApiModelProperty("下单用户")
- private String user;
- @ApiModelProperty("货物信息")
- private String cargoNumber;
- @ApiModelProperty("备注")
- private String remark;
- @ApiModelProperty("支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））")
- private Integer payManner;
- private Long travelTime;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getTime() {
- return time;
- }
-
- public void setTime(String time) {
- this.time = time;
- }
-
- public String getStartAddress() {
- return startAddress;
- }
-
- public void setStartAddress(String startAddress) {
- this.startAddress = startAddress;
- }
-
- public String getEndAddress() {
- return endAddress;
- }
-
- public void setEndAddress(String endAddress) {
- this.endAddress = endAddress;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Double getRedMoney() {
- return redMoney;
- }
-
- public void setRedMoney(Double redMoney) {
- this.redMoney = redMoney;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Double getOrderMoney() {
- return orderMoney;
- }
-
- public void setOrderMoney(Double orderMoney) {
- this.orderMoney = orderMoney;
- }
-
- public Integer getPeopleNumber() {
- return peopleNumber;
- }
-
- public void setPeopleNumber(Integer peopleNumber) {
- this.peopleNumber = peopleNumber;
- }
-
- public String getUser() {
- return user;
- }
-
- public void setUser(String user) {
- this.user = user;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getPayManner() {
- return payManner;
- }
-
- public void setPayManner(Integer payManner) {
- this.payManner = payManner;
- }
-
- public Long getTravelTime() {
- return travelTime;
- }
-
- public void setTravelTime(Long travelTime) {
- this.travelTime = travelTime;
- }
-
- public String getCargoNumber() {
- return cargoNumber;
- }
-
- public void setCargoNumber(String cargoNumber) {
- this.cargoNumber = cargoNumber;
- }
-
- @Override
- public String toString() {
- return "OrderListWarpper{" +
- "id=" + id +
- ", type=" + type +
- ", name='" + name + '\'' +
- ", time='" + time + '\'' +
- ", startAddress='" + startAddress + '\'' +
- ", endAddress='" + endAddress + '\'' +
- ", redMoney=" + redMoney +
- ", orderMoney=" + orderMoney +
- ", state=" + state +
- ", peopleNumber=" + peopleNumber +
- ", user='" + user + '\'' +
- ", remark='" + remark + '\'' +
- ", payManner=" + payManner +
- '}';
- }
-
- public static List<OrderListWarpper> getOrderListWarpper(List<Map<String, Object>> maps){
- List<OrderListWarpper> list = new ArrayList<>();
- if(null != maps){
- for(Map<String, Object> map : maps){
- OrderListWarpper orderListWarpper = new OrderListWarpper();
- orderListWarpper.setId(null != map.get("id") ? Integer.valueOf(String.valueOf(map.get("id"))) : 0);
- orderListWarpper.setName(null != map.get("name") ? String.valueOf(map.get("name")) : "");
- orderListWarpper.setTime(null != map.get("time") ? String.valueOf(map.get("time")) : "");
- orderListWarpper.setStartAddress(null != map.get("startAddress") ? String.valueOf(map.get("startAddress")) : "");
- orderListWarpper.setEndAddress(null != map.get("endAddress") ? String.valueOf(map.get("endAddress")) : "");
- orderListWarpper.setState(null != map.get("state") ? Integer.valueOf(String.valueOf(map.get("state"))) : 0);
- orderListWarpper.setRedMoney(null != map.get("redMoney") ? Double.valueOf(String.valueOf(map.get("redMoney"))) : 0);
- orderListWarpper.setOrderMoney(null != map.get("orderMoney") ? Double.valueOf(String.valueOf(map.get("orderMoney"))) : 0);
- orderListWarpper.setType(null != map.get("type") ? Integer.valueOf(String.valueOf(map.get("type"))) : 0);
- orderListWarpper.setPeopleNumber(null != map.get("peopleNumber") ? Integer.valueOf(String.valueOf(map.get("peopleNumber"))) : 0);
- orderListWarpper.setUser(null != map.get("user") ? String.valueOf(map.get("user")) : "");
- orderListWarpper.setCargoNumber(null != map.get("cargoNumber") ? String.valueOf(map.get("cargoNumber")) : "");
- orderListWarpper.setRemark(null != map.get("remark") ? String.valueOf(map.get("remark")) : "");
- orderListWarpper.setPayManner(null != map.get("payManner") ? Integer.valueOf(String.valueOf(map.get("payManner"))) : 0);
- orderListWarpper.setTravelTime(null != map.get("travelTime") ? Long.valueOf(String.valueOf(map.get("travelTime"))) : 0);
- list.add(orderListWarpper);
- }
- }
- Collections.sort(list);
- return list;
- }
-
- @Override
- public int compareTo(Object o) {
- if (o instanceof OrderListWarpper) {
- OrderListWarpper s = (OrderListWarpper) o;
- if(this.travelTime == null || s.travelTime == null){
- return -1;
- }
- if (this.travelTime > s.travelTime) {
- return -1;
- } else if (this.travelTime == s.travelTime) {
- return 0;
- } else {
- return 1;
- }
- }
- return 0;
- }
}
--
Gitblit v1.7.1