From af6d43a41205f8c7fc1a965cb019c039063bf4f0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 13 十二月 2023 01:15:07 +0800
Subject: [PATCH] 更新接口
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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..62961dc 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,12 @@
private String moneyTime;
private Integer startDuration;
+ /**
+ * 收据链接
+ */
+ @ApiModelProperty("收据链接")
+ private String receipt;
+
public Integer getStartDuration() {
return startDuration;
@@ -648,6 +655,22 @@
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;
+ }
+
@Override
public String toString() {
return "OrderInfoWarpper{" +
@@ -774,6 +797,8 @@
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() : "");
}
if(orderInfoWarpper.getState()==7){
orderInfoWarpper.setOrderMoney(orderInfoWarpper.getOrderMoney()-orderInfoWarpper.getDiscountMoney());
--
Gitblit v1.7.1