From 75a2623173bcc4a235aa1f99f7ef28519186160b Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:24:25 +0800
Subject: [PATCH] 代码调整
---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java | 79 ---------------------------------------
1 files changed, 0 insertions(+), 79 deletions(-)
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
index 08c1e27..5f5c55b 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
@@ -43,61 +43,13 @@
private Double payMoney;
@ApiModelProperty("差价金额")
private Double differenceMoney;
- @ApiModelProperty("感谢费")
- private Double thankYouFee;
@ApiModelProperty("开票状态（1=未开票，2=已开票）")
private Integer invoice;
@ApiModelProperty("订单名称")
private String orderName;
@ApiModelProperty("订单类型（1=专车，2=出租车，3=跨城出行，4=同城小件物流，5=跨城小件物流）")
private Integer orderType;
- @ApiModelProperty("小件物流用户上传图片，多个英文分号分隔")
- private String userImg;
- @ApiModelProperty("小件物流司机上传图片，多个英文分号分隔")
- private String driverImg;
- @ApiModelProperty("需要送达时间")
- private String arriveTimeExpect;
- @ApiModelProperty("下单时间")
private Long insertTime;
- @ApiModelProperty("取件码")
- private String pickUpCode;
- @ApiModelProperty("服务结束事件")
- private String endServiceTime;
-
- @ApiModelProperty("乘车类型(1=独享，2=一口价，3=拼车)")
- private Integer rideType;
-
- public Integer getRideType() {
- return rideType;
- }
-
- public void setRideType(Integer rideType) {
- this.rideType = rideType;
- }
-
- public String getEndServiceTime() {
- return endServiceTime;
- }
-
- public void setEndServiceTime(String endServiceTime) {
- this.endServiceTime = endServiceTime;
- }
-
- public String getPickUpCode() {
- return pickUpCode;
- }
-
- public void setPickUpCode(String pickUpCode) {
- this.pickUpCode = pickUpCode;
- }
-
- public String getArriveTimeExpect() {
- return arriveTimeExpect;
- }
-
- public void setArriveTimeExpect(String arriveTimeExpect) {
- this.arriveTimeExpect = arriveTimeExpect;
- }
public Integer getOrderId() {
return orderId;
@@ -243,30 +195,6 @@
this.differenceMoney = differenceMoney;
}
- public Double getThankYouFee() {
- return thankYouFee;
- }
-
- public void setThankYouFee(Double thankYouFee) {
- this.thankYouFee = thankYouFee;
- }
-
- public String getUserImg() {
- return userImg;
- }
-
- public void setUserImg(String userImg) {
- this.userImg = userImg;
- }
-
- public String getDriverImg() {
- return driverImg;
- }
-
- public void setDriverImg(String driverImg) {
- this.driverImg = driverImg;
- }
-
@Override
public String toString() {
return "OrderWarpper{" +
@@ -294,7 +222,6 @@
if(null != maps){
for(Map<String, Object> map : maps){
OrderWarpper orderWarpper = new OrderWarpper();
- orderWarpper.setRideType(null != map.get("rideType") ? Integer.valueOf(String.valueOf(map.get("rideType"))) : 1);
orderWarpper.setOrderId(null != map.get("orderId") ? Integer.valueOf(String.valueOf(map.get("orderId"))) : 0);
orderWarpper.setOrderTime(null != map.get("orderTime") ? String.valueOf(map.get("orderTime")) : "");
orderWarpper.setTime(null != map.get("time") ? String.valueOf(map.get("time")) : "");
@@ -313,12 +240,6 @@
orderWarpper.setCarTime(null != map.get("carTime") ? Integer.valueOf(String.valueOf(map.get("carTime"))) : 0);
orderWarpper.setServerCarModel(null != map.get("serverCarModel") ? String.valueOf(map.get("serverCarModel")) : "");
orderWarpper.setDifferenceMoney(null != map.get("differenceMoney") ? Double.valueOf(map.get("differenceMoney").toString()) : 0D);
- orderWarpper.setUserImg(null != map.get("userImg") ? String.valueOf(map.get("userImg")) : "");
- orderWarpper.setDriverImg(null != map.get("driverImg") ? String.valueOf(map.get("driverImg")) : "");
- orderWarpper.setThankYouFee(null != map.get("thankYouFee") ? Double.valueOf(map.get("thankYouFee").toString()) : 0D);
- orderWarpper.setArriveTimeExpect(null != map.get("arriveTimeExpect") ? String.valueOf(String.valueOf(map.get("arriveTimeExpect"))) : "");
- orderWarpper.setPickUpCode(null != map.get("pickUpCode") ? String.valueOf(map.get("pickUpCode")) : "");
- orderWarpper.setEndServiceTime(null != map.get("endServiceTime") ? String.valueOf(map.get("endServiceTime")) : "");
list.add(orderWarpper);
}
}
--
Gitblit v1.7.1