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/OrderInfoWarpper.java | 260 ---------------------------------------------------
1 files changed, 1 insertions(+), 259 deletions(-)
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index 0e7e607..93ef99e 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -1,13 +1,8 @@
package com.stylefeng.guns.modular.system.warpper;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
@ApiModel("订单详情")
@@ -104,12 +99,6 @@
private Double discount;
@ApiModelProperty("折扣优惠金额")
private Double discountMoney;
- @ApiModelProperty("打车卡优惠金额")
- private Double taxiCardMoney;
- @ApiModelProperty("节假日费")
- private Double holidayFee;
- @ApiModelProperty("附加费")
- private List<OrderAdditionalFeeWarpper> orderAdditionalFeeWarpper;
@ApiModelProperty("订单支付金额")
private Double payMoney;
@ApiModelProperty("小费金额")
@@ -134,211 +123,6 @@
private String cancelRemark;
@ApiModelProperty("备注")
private String remark;
-
- @ApiModelProperty("1=司机取消")
- private Integer driverCancle;
-
- @ApiModelProperty("一人拼成规则")
- private JSONObject contentPutOne;//一人拼成
- @ApiModelProperty("一人未拼成规则")
- private JSONObject contentNotOne;//一人未拼成
- @ApiModelProperty("2人拼成规则")
- private JSONObject contentPutTwo;//2人拼成
- @ApiModelProperty("2人未拼成规则")
- private JSONObject contentNotTwo;//2人未拼成
- @ApiModelProperty("3人拼成规则")
- private JSONObject contentPutThree;//3人拼成
- @ApiModelProperty("3人未拼成规则")
- private JSONObject contentNotThree;//3人未拼成
- @ApiModelProperty("独享规则")
- private JSONObject contentExclusive;//独享
- @ApiModelProperty("一口价规则")
- private JSONObject contentPrice;//一口价
-
- @ApiModelProperty("计价说明（拼车）")
- private String fareTypeNote1;
- @ApiModelProperty("计价说明（独享）")
- private String fareTypeNote2;
- @ApiModelProperty("计价说明（一口价）")
- private String fareTypeNote3;
-
- public JSONObject getContentPutOne() {
- return contentPutOne;
- }
-
- public void setContentPutOne(JSONObject contentPutOne) {
- this.contentPutOne = contentPutOne;
- }
-
- public JSONObject getContentNotOne() {
- return contentNotOne;
- }
-
- public void setContentNotOne(JSONObject contentNotOne) {
- this.contentNotOne = contentNotOne;
- }
-
- public JSONObject getContentPutTwo() {
- return contentPutTwo;
- }
-
- public void setContentPutTwo(JSONObject contentPutTwo) {
- this.contentPutTwo = contentPutTwo;
- }
-
- public JSONObject getContentNotTwo() {
- return contentNotTwo;
- }
-
- public void setContentNotTwo(JSONObject contentNotTwo) {
- this.contentNotTwo = contentNotTwo;
- }
-
- public JSONObject getContentPutThree() {
- return contentPutThree;
- }
-
- public void setContentPutThree(JSONObject contentPutThree) {
- this.contentPutThree = contentPutThree;
- }
-
- public JSONObject getContentNotThree() {
- return contentNotThree;
- }
-
- public void setContentNotThree(JSONObject contentNotThree) {
- this.contentNotThree = contentNotThree;
- }
-
- public JSONObject getContentExclusive() {
- return contentExclusive;
- }
-
- public void setContentExclusive(JSONObject contentExclusive) {
- this.contentExclusive = contentExclusive;
- }
-
- public JSONObject getContentPrice() {
- return contentPrice;
- }
-
- public void setContentPrice(JSONObject contentPrice) {
- this.contentPrice = contentPrice;
- }
-
- public String getFareTypeNote1() {
- return fareTypeNote1;
- }
-
- public void setFareTypeNote1(String fareTypeNote1) {
- this.fareTypeNote1 = fareTypeNote1;
- }
-
- public String getFareTypeNote2() {
- return fareTypeNote2;
- }
-
- public void setFareTypeNote2(String fareTypeNote2) {
- this.fareTypeNote2 = fareTypeNote2;
- }
-
- public String getFareTypeNote3() {
- return fareTypeNote3;
- }
-
- public void setFareTypeNote3(String fareTypeNote3) {
- this.fareTypeNote3 = fareTypeNote3;
- }
-
- public Integer getDriverCancle() {
- return driverCancle;
- }
-
- public void setDriverCancle(Integer driverCancle) {
- this.driverCancle = driverCancle;
- }
-
- /**
- * 乘车类型(1=独享，2=一口价，3=拼车)
- */
- @ApiModelProperty("乘车类型(1=独享，2=一口价，3=拼车)")
- private Integer rideType;
-
- private Integer pid;
-
- @ApiModelProperty("0未成功，1成功")
- private Integer spellSuccess;
-
- @ApiModelProperty("等待费规则")
- private String waitRule;
- @ApiModelProperty("计费规则")
- private String chargeRule;
-
- @ApiModelProperty("计费规则")
- private String chargeRules;
-
- public String getChargeRules() {
- return chargeRules;
- }
-
- public void setChargeRules(String chargeRules) {
- this.chargeRules = chargeRules;
- }
-
- public String getWaitRule() {
- return waitRule;
- }
-
- public void setWaitRule(String waitRule) {
- this.waitRule = waitRule;
- }
-
- public String getChargeRule() {
- return chargeRule;
- }
-
- public void setChargeRule(String chargeRule) {
- this.chargeRule = chargeRule;
- }
-
-
- public Integer getSpellSuccess() {
- return spellSuccess;
- }
-
- public void setSpellSuccess(Integer spellSuccess) {
- this.spellSuccess = spellSuccess;
- }
-
- public Integer getPid() {
- return pid;
- }
-
- public void setPid(Integer pid) {
- this.pid = pid;
- }
-
- @ApiModelProperty("送人订单")
- private List<OrderCrossCityInfoWrapper> giveOrderList=new ArrayList<>();
-
- @ApiModelProperty("接人订单")
- private List<OrderCrossCityInfoWrapper> meetOrderList=new ArrayList<>();
-
- public List<OrderCrossCityInfoWrapper> getGiveOrderList() {
- return giveOrderList;
- }
-
- public void setGiveOrderList(List<OrderCrossCityInfoWrapper> giveOrderList) {
- this.giveOrderList = giveOrderList;
- }
-
- public List<OrderCrossCityInfoWrapper> getMeetOrderList() {
- return meetOrderList;
- }
-
- public void setMeetOrderList(List<OrderCrossCityInfoWrapper> meetOrderList) {
- this.meetOrderList = meetOrderList;
- }
public Integer getOrderId() {
return orderId;
@@ -804,38 +588,6 @@
this.lineShiftTime = lineShiftTime;
}
- public Double getTaxiCardMoney() {
- return taxiCardMoney;
- }
-
- public void setTaxiCardMoney(Double taxiCardMoney) {
- this.taxiCardMoney = taxiCardMoney;
- }
-
- public Double getHolidayFee() {
- return holidayFee;
- }
-
- public void setHolidayFee(Double holidayFee) {
- this.holidayFee = holidayFee;
- }
-
- public Integer getRideType() {
- return rideType;
- }
-
- public void setRideType(Integer rideType) {
- this.rideType = rideType;
- }
-
- public List<OrderAdditionalFeeWarpper> getOrderAdditionalFeeWarpper() {
- return orderAdditionalFeeWarpper;
- }
-
- public void setOrderAdditionalFeeWarpper(List<OrderAdditionalFeeWarpper> orderAdditionalFeeWarpper) {
- this.orderAdditionalFeeWarpper = orderAdditionalFeeWarpper;
- }
-
@Override
public String toString() {
return "OrderInfoWarpper{" +
@@ -897,14 +649,10 @@
'}';
}
- public static OrderInfoWarpper getOrderInfoWarpper(Map<String, Object> map, List<OrderAdditionalFeeWarpper> list){
+ public static OrderInfoWarpper getOrderInfoWarpper(Map<String, Object> map){
OrderInfoWarpper orderInfoWarpper = new OrderInfoWarpper();
if(null != map){
orderInfoWarpper.setOrderId(null != map.get("orderId") ? Integer.valueOf(String.valueOf(map.get("orderId"))) : 0);
- orderInfoWarpper.setPid(null != map.get("pid") ? Integer.valueOf(String.valueOf(map.get("pid"))) : 0);
- orderInfoWarpper.setSpellSuccess(null != map.get("spellSuccess") ? Integer.valueOf(String.valueOf(map.get("spellSuccess"))) : 1);
- orderInfoWarpper.setDriverCancle(null != map.get("driverCancle") ? Integer.valueOf(String.valueOf(map.get("driverCancle"))) : 0);
- orderInfoWarpper.setRideType(null != map.get("rideType") ? Integer.valueOf(String.valueOf(map.get("rideType"))) : 1);
orderInfoWarpper.setOrderType(null != map.get("orderType") ? Integer.valueOf(map.get("orderType").toString()) : 0);
orderInfoWarpper.setType(null != map.get("type") ? Integer.valueOf(map.get("type").toString()) : 0);
orderInfoWarpper.setState(null != map.get("state") ? Integer.valueOf(String.valueOf(map.get("state"))) : 0);
@@ -917,9 +665,6 @@
orderInfoWarpper.setDriverName(null != map.get("driverName") ? String.valueOf(map.get("driverName")).substring(0, 1) + "师傅" : "");
orderInfoWarpper.setLicensePlate(null != map.get("licensePlate") ? String.valueOf(map.get("licensePlate")) : "");
orderInfoWarpper.setBrand(null != map.get("brand") ? String.valueOf(map.get("brand")) : "");
- orderInfoWarpper.setWaitRule(null != map.get("waitRule") ? String.valueOf(map.get("waitRule")) : "");
- orderInfoWarpper.setChargeRule(null != map.get("chargeRule") ? String.valueOf(map.get("chargeRule")) : "");
- orderInfoWarpper.setChargeRules(null != map.get("chargeRules") ? String.valueOf(map.get("chargeRules")) : "");
orderInfoWarpper.setScore(null != map.get("score") ? Double.valueOf(String.valueOf(map.get("score"))) : 0);
orderInfoWarpper.setOrderNum(null != map.get("orderNum") ? Integer.valueOf(String.valueOf(map.get("orderNum"))) : 0);
orderInfoWarpper.setDriverPhone(null != map.get("driverPhone") ? String.valueOf(map.get("driverPhone")) : "");
@@ -965,9 +710,6 @@
orderInfoWarpper.setEndCity(null != map.get("endCity") ? map.get("endCity").toString() : "");
orderInfoWarpper.setRemark(null != map.get("remark") ? map.get("remark").toString() : "");
orderInfoWarpper.setLineShiftTime(null != map.get("lineShiftTime") ? map.get("lineShiftTime").toString() : "");
- orderInfoWarpper.setHolidayFee(null != map.get("holidayFee") ? Double.valueOf(map.get("holidayFee").toString()) : 0);
- orderInfoWarpper.setTaxiCardMoney(null != map.get("taxiCardMoney") ? Double.valueOf(map.get("taxiCardMoney").toString()) : 0);
- orderInfoWarpper.setOrderAdditionalFeeWarpper(list);
}
return orderInfoWarpper;
}
--
Gitblit v1.7.1