From dc4972749d8dc399b02a548adfd12119fc8c2bcd Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期一, 11 五月 2026 20:49:52 +0800
Subject: [PATCH] fix bugs

---
 UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java |   14 +++++++++++++-
 1 files changed, 13 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 7c5b29c..f6768b1 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
@@ -209,7 +209,18 @@
 
     @ApiModelProperty("取消类型1可以取消 2不可取消")
     private Integer cancelType;
+    /**
+     * 预支付阶段(0=非预支付,1=待首付,2=已首付待结算,3=待补差,4=待退款,5=结算完成)
+     */
+    private Integer prepayStage;
 
+    public Integer getPrepayStage() {
+        return prepayStage;
+    }
+
+    public void setPrepayStage(Integer prepayStage) {
+        this.prepayStage = prepayStage;
+    }
 
     public Integer getCancelType() {
         return cancelType;
@@ -1141,7 +1152,8 @@
             orderInfoWarpper.setPaymentMode(null != map.get("paymentMode") ? Integer.valueOf(map.get("paymentMode").toString()) : null);
             orderInfoWarpper.setOrderAdditionalFeeWarpper(list);
             orderInfoWarpper.setCancelType(null != map.get("cancelType") ? Integer.valueOf(map.get("cancelType").toString()) : 1);
-            orderInfoWarpper.setOrderMoney(null != map.get("estimateAmount") ? Double.valueOf(String.valueOf(map.get("estimateAmount"))) : 0);
+            orderInfoWarpper.setEstimateAmount(null != map.get("estimateAmount") ? Double.valueOf(String.valueOf(map.get("estimateAmount"))) : 0);
+            orderInfoWarpper.setPrepayStage(null != map.get("prepayStage") ? Integer.valueOf(String.valueOf(map.get("prepayStage"))) : 0);
         }
         return orderInfoWarpper;
     }

--
Gitblit v1.7.1