From e52227b01983146f2e3c81dc575141d8b9889497 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 10:16:30 +0800
Subject: [PATCH] 代码调整
---
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 156 ++-------------------------------------------------
1 files changed, 7 insertions(+), 149 deletions(-)
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index c6c63d0..52f9e3b 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -1,6 +1,5 @@
package com.stylefeng.guns.modular.system.warpper;
-import com.stylefeng.guns.core.util.ToolUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -53,8 +52,6 @@
private Double payMoney;
@ApiModelProperty("差价金额")
private Double differenceMoney;
- @ApiModelProperty("支付感谢金额")
- private Double thankYouFee;
@ApiModelProperty("是否是改派单（1=否，2=是）")
private Integer isReassign;
@ApiModelProperty("高德猎鹰轨迹id(订单开始后需要上传坐标到指定轨迹中)")
@@ -87,74 +84,8 @@
private Integer urgent;
@ApiModelProperty("下单用户姓名")
private String userName;
- @ApiModelProperty("下单用户电话")
- private String userPhone;
- @ApiModelProperty("小件物流用户上传的图片")
- private String userImg;
- @ApiModelProperty("小件物流司机上传的图片")
- private String driverImg;
- @ApiModelProperty("需要送达时间")
- private String arriveTimeExpect;
-
-
- @ApiModelProperty("申诉状态 1=可申诉，2=不可申诉")
- private Integer appealState;
- @ApiModelProperty("超时费用")
- private Double timeOutMoney;
- @ApiModelProperty("退还费用")
- private Double returnMoney;
- @ApiModelProperty("提示信息")
- private String note;
- @ApiModelProperty("送达时间")
- private String endServiceTime;
-
- public Double getReturnMoney() {
- return returnMoney;
- }
-
- public void setReturnMoney(Double returnMoney) {
- this.returnMoney = returnMoney;
- }
-
- public Integer getAppealState() {
- return appealState;
- }
-
- public void setAppealState(Integer appealState) {
- this.appealState = appealState;
- }
-
- public Double getTimeOutMoney() {
- return timeOutMoney;
- }
-
- public void setTimeOutMoney(Double timeOutMoney) {
- this.timeOutMoney = timeOutMoney;
- }
-
- public String getNote() {
- return note;
- }
-
- public void setNote(String note) {
- this.note = note;
- }
-
- public String getEndServiceTime() {
- return endServiceTime;
- }
-
- public void setEndServiceTime(String endServiceTime) {
- this.endServiceTime = endServiceTime;
- }
-
- public String getArriveTimeExpect() {
- return arriveTimeExpect;
- }
-
- public void setArriveTimeExpect(String arriveTimeExpect) {
- this.arriveTimeExpect = arriveTimeExpect;
- }
+ @ApiModelProperty("订单来源（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单，6：道行龙城，7：智慧屏）")
+ private Integer orderSource;
public Integer getOrderId() {
return orderId;
@@ -460,68 +391,12 @@
this.differenceMoney = differenceMoney;
}
- public Double getThankYouFee() {
- return thankYouFee;
+ public Integer getOrderSource() {
+ return orderSource;
}
- public void setThankYouFee(Double thankYouFee) {
- this.thankYouFee = thankYouFee;
- }
-
- public String getUserPhone() {
- return userPhone;
- }
-
- public void setUserPhone(String userPhone) {
- this.userPhone = userPhone;
- }
-
- public String getUserImg() {
- return userImg;
- }
-
- public void setUserImg(String userImg) {
- this.userImg = userImg;
- }
-
- public String getDriverImg() {
- return driverImg;
- }
-
- public Integer getSpellSuccess() {
- return spellSuccess;
- }
-
- public void setSpellSuccess(Integer spellSuccess) {
- this.spellSuccess = spellSuccess;
- }
-
- public void setDriverImg(String driverImg) {
- this.driverImg = driverImg;
- }
-
- @ApiModelProperty("乘车类型(1=独享，2=一口价，3=拼车)")
- private Integer rideType;
- @ApiModelProperty("是否拼车成功(0未成功，1成功)")
- private Integer spellSuccess;
-
- @ApiModelProperty("是否可以操作(0不可以，1可以)")
- private Integer canOperation;
-
- public Integer getCanOperation() {
- return canOperation;
- }
-
- public void setCanOperation(Integer canOperation) {
- this.canOperation = canOperation;
- }
-
- public Integer getRideType() {
- return rideType;
- }
-
- public void setRideType(Integer rideType) {
- this.rideType = rideType;
+ public void setOrderSource(Integer orderSource) {
+ this.orderSource = orderSource;
}
@Override
@@ -569,8 +444,6 @@
public static OrderInfoWarpper getOrderInfoWarpper(Map<String, Object> map){
OrderInfoWarpper orderInfoWarpper = new OrderInfoWarpper();
if(null != map){
- orderInfoWarpper.setCanOperation(null != map.get("canOperation") ? Integer.valueOf(String.valueOf(map.get("canOperation"))) : 1);
- orderInfoWarpper.setRideType(null != map.get("rideType") ? Integer.valueOf(String.valueOf(map.get("rideType"))) : 1);
orderInfoWarpper.setOrderId(null != map.get("orderId") ? Integer.valueOf(String.valueOf(map.get("orderId"))) : 0);
orderInfoWarpper.setOrderState(null != map.get("orderState") ? Integer.valueOf(String.valueOf(map.get("orderState"))) : 0);
orderInfoWarpper.setOrderName(null != map.get("orderName") ? String.valueOf(map.get("orderName")) : "");
@@ -589,7 +462,6 @@
orderInfoWarpper.setNickName(null != map.get("nickName") ? String.valueOf(map.get("nickName")) : "");
orderInfoWarpper.setPhone(null != map.get("telX") ? String.valueOf(map.get("telX")) : (null != map.get("phone") ? String.valueOf(map.get("phone")) : ""));
orderInfoWarpper.setHistoryNum(null != map.get("historyNum") ? Integer.valueOf(String.valueOf(map.get("historyNum"))) : 0);
- orderInfoWarpper.setSpellSuccess(null != map.get("spellSuccess") ? Integer.valueOf(String.valueOf(map.get("spellSuccess"))) : 0);
orderInfoWarpper.setOrderMoney(null != map.get("orderMoney") ? Double.valueOf(String.valueOf(map.get("orderMoney"))) : 0);
orderInfoWarpper.setPayManner(null != map.get("payManner") ? Integer.valueOf(String.valueOf(map.get("payManner"))) : 0);
orderInfoWarpper.setPayMoney(null != map.get("payMoney") ? Double.valueOf(String.valueOf(map.get("payMoney"))) : 0);
@@ -609,22 +481,8 @@
orderInfoWarpper.setCargoType(null != map.get("cargoType") ? Integer.valueOf(map.get("cargoType").toString()) : 0);
orderInfoWarpper.setUrgent(null != map.get("urgent") ? Integer.valueOf(map.get("urgent").toString()) : 0);
orderInfoWarpper.setUserName(null != map.get("userName") ? String.valueOf(map.get("userName")) : "");
- orderInfoWarpper.setUserPhone(null != map.get("userPhone") ? String.valueOf(map.get("userPhone")) : "");
orderInfoWarpper.setDifferenceMoney(null != map.get("differenceMoney") ? Double.valueOf(map.get("differenceMoney").toString()) : 0D);
- orderInfoWarpper.setUserImg(null != map.get("userImg") ? String.valueOf(map.get("userImg")) : "");
- orderInfoWarpper.setDriverImg(null != map.get("driverImg") ? String.valueOf(map.get("driverImg")) : "");
- orderInfoWarpper.setThankYouFee(null != map.get("thankYouFee") ? Double.valueOf(map.get("thankYouFee").toString()) : 0D);
- orderInfoWarpper.setArriveTimeExpect(null != map.get("arriveTimeExpect") ? String.valueOf(map.get("arriveTimeExpect")) : "");
-
- orderInfoWarpper.setEndServiceTime(null != map.get("endServiceTime") ? String.valueOf(map.get("endServiceTime")) : "");
- if (ToolUtil.isNotEmpty(map.get("appealState"))){
- orderInfoWarpper.setAppealState(Integer.valueOf(map.get("appealState").toString()));
- }else {
- orderInfoWarpper.setAppealState(1);
- }
- orderInfoWarpper.setNote(null != map.get("note") ? String.valueOf(map.get("note")) : "");
- orderInfoWarpper.setTimeOutMoney(null != map.get("timeOutMoney") ? Double.valueOf(String.valueOf(map.get("timeOutMoney"))) : 0D);
- orderInfoWarpper.setReturnMoney(null != map.get("returnMoney") ? Double.valueOf(String.valueOf(map.get("returnMoney"))) : 0D);
+ orderInfoWarpper.setOrderSource(null != map.get("orderSource") ? Integer.valueOf(map.get("orderSource").toString()) : 0);
}
return orderInfoWarpper;
}
--
Gitblit v1.7.1