From fe6554694d8ddf332b3d050ebb8eb5a920554880 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 23 三月 2026 16:44:51 +0800
Subject: [PATCH] feat:专车、出租车预支付下单联调修改
---
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index c5b39dd..859ffe6 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -1,8 +1,8 @@
package com.stylefeng.guns.modular.system.warpper;
+import com.alibaba.fastjson.JSONArray;
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;
@@ -11,6 +11,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
@ApiModel("订单详情")
public class OrderInfoWarpper {
@@ -192,6 +193,35 @@
@ApiModelProperty("是否包车 1是2否")
private Integer zwNum;
+
+ /**
+ * 下单时系统支付模式（1=先付，2=后付）
+ */
+ @TableField("paymentMode")
+ private Integer paymentMode;
+
+ /**
+ * 预估金额（先付模式下单时计算并存储）
+ */
+ @TableField("estimateAmount")
+ private Double estimateAmount;
+
+
+ public Double getEstimateAmount() {
+ return estimateAmount;
+ }
+
+ public void setEstimateAmount(Double estimateAmount) {
+ this.estimateAmount = estimateAmount;
+ }
+
+ public Integer getPaymentMode() {
+ return paymentMode;
+ }
+
+ public void setPaymentMode(Integer paymentMode) {
+ this.paymentMode = paymentMode;
+ }
public Integer getZwNum() {
return zwNum;
@@ -1011,6 +1041,13 @@
public static OrderInfoWarpper getOrderInfoWarpper(Map<String, Object> map, List<OrderAdditionalFeeWarpper> list){
OrderInfoWarpper orderInfoWarpper = new OrderInfoWarpper();
if(null != map){
+ Object serverCarModel = map.get("serverCarModel");
+ if (Objects.nonNull(serverCarModel)) {
+ JSONArray jsonArray = JSONArray.parseArray(serverCarModel.toString());
+ if (jsonArray.size() == 1) {
+ map.put("rideType", jsonArray.getJSONObject(0).getIntValue("rideType"));
+ }
+ }
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);
@@ -1087,6 +1124,8 @@
orderInfoWarpper.setResponsibilityType(null != map.get("responsibilityType") ? map.get("responsibilityType").toString() : null);
orderInfoWarpper.setCompanyName(null != map.get("companyName") ? map.get("companyName").toString() : null);
orderInfoWarpper.setZwNum(null != map.get("zwNum") ? Integer.valueOf(map.get("zwNum").toString()) : null);
+ orderInfoWarpper.setPaymentMode(null != map.get("paymentMode") ? Integer.valueOf(map.get("paymentMode").toString()) : null);
+ orderInfoWarpper.setPaymentMode(null != map.get("paymentMode") ? Integer.valueOf(map.get("paymentMode").toString()) : null);
orderInfoWarpper.setOrderAdditionalFeeWarpper(list);
}
return orderInfoWarpper;
--
Gitblit v1.7.1