From a075cdd2f76fae321ecf95dce363141ade30f0f1 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 12 四月 2024 22:37:58 +0800
Subject: [PATCH] 新增加功能
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index 0e0e8b3..9928070 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -103,6 +103,8 @@
private Double discountMoney;
@ApiModelProperty("订单支付金额")
private Double payMoney;
+ @ApiModelProperty("订单支付方式（1=手机支付，2=银行卡支付，3=余额支付，4=现金支付）")
+ private Integer payType;
@ApiModelProperty("小费金额")
private Double tipMoney;
@ApiModelProperty("订单评分")
@@ -125,7 +127,6 @@
private String cancelRemark;
@ApiModelProperty("备注")
private String remark;
-
@ApiModelProperty("是否首单免费1否，2是")
private String isFree;
@@ -141,6 +142,13 @@
private String moneyTime;
private Integer startDuration;
+ /**
+ * 收据链接
+ */
+ @ApiModelProperty("收据链接")
+ private String receipt;
+ @ApiModelProperty("是否冻结（1=否，2=是）")
+ private Integer isFrozen;
public Integer getStartDuration() {
return startDuration;
@@ -648,6 +656,30 @@
this.lineShiftTime = lineShiftTime;
}
+ public Integer getPayType() {
+ return payType;
+ }
+
+ public void setPayType(Integer payType) {
+ this.payType = payType;
+ }
+
+ public String getReceipt() {
+ return receipt;
+ }
+
+ public void setReceipt(String receipt) {
+ this.receipt = receipt;
+ }
+
+ public Integer getIsFrozen() {
+ return isFrozen;
+ }
+
+ public void setIsFrozen(Integer isFrozen) {
+ this.isFrozen = isFrozen;
+ }
+
@Override
public String toString() {
return "OrderInfoWarpper{" +
@@ -723,7 +755,7 @@
orderInfoWarpper.setEndAddress(null != map.get("endAddress") ? String.valueOf(map.get("endAddress")) : "");
orderInfoWarpper.setDriverId(null != map.get("driverId") ? Integer.valueOf(String.valueOf(map.get("driverId"))) : 0);
orderInfoWarpper.setDriverAvatar(null != map.get("driverAvatar") ? String.valueOf(map.get("driverAvatar")) : "");
- orderInfoWarpper.setDriverName(null != map.get("driverName") ? String.valueOf(map.get("driverName")).substring(0, 1) + "师傅" : "");
+ orderInfoWarpper.setDriverName(null != map.get("driverName") ? String.valueOf(map.get("driverName")) : "");
orderInfoWarpper.setLicensePlate(null != map.get("licensePlate") ? String.valueOf(map.get("licensePlate")) : "");
orderInfoWarpper.setBrand(null != map.get("brand") ? String.valueOf(map.get("brand")) : "");
orderInfoWarpper.setScore(null != map.get("score") ? Double.valueOf(String.valueOf(map.get("score"))) : 0);
@@ -774,6 +806,9 @@
orderInfoWarpper.setIsFree(null != map.get("isFree") ? map.get("isFree").toString() :"1");
orderInfoWarpper.setMoneyType(null != map.get("moneyType") ? Integer.valueOf(map.get("moneyType").toString()) :1);
orderInfoWarpper.setMoneyTime(null != map.get("moneyTime") ? map.get("moneyTime").toString() :"");
+ orderInfoWarpper.setPayType(null != map.get("payType") ? Integer.valueOf(map.get("payType").toString()) : 4);
+ orderInfoWarpper.setReceipt(null != map.get("receipt") ? map.get("receipt").toString() : "");
+ orderInfoWarpper.setIsFrozen(null != map.get("isFrozen") ? Integer.valueOf(map.get("isFrozen").toString()) : 1);
}
if(orderInfoWarpper.getState()==7){
orderInfoWarpper.setOrderMoney(orderInfoWarpper.getOrderMoney()-orderInfoWarpper.getDiscountMoney());
--
Gitblit v1.7.1