From 7e0384601e24ff67a8f5ea9bfdf692a64a1064d3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 20:47:32 +0800
Subject: [PATCH] 是否包车

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java |    7 ++++++-
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java                 |   12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 7bb2445..f85e29d 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1445,7 +1445,12 @@
         if(map.get("abnormalIntro")!=null){
             map.put("appealStatus", 1);
         }
-        
+        if(map.get("travelMode")!=null &&map.get("travelMode").toString().equals("2") ){
+            map.put("zwNum", 1);
+        }else {
+			map.put("zwNum", 2);
+		}
+
 		Map<String, String> geocode = gdMapGeocodingUtil.geocode(map.get("startLon").toString(), map.get("startLat").toString());
 		map.put("startCity", geocode.get("city"));
 		geocode = gdMapGeocodingUtil.geocode(map.get("endLon").toString(), map.get("endLat").toString());
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index deb83d6..c5b39dd 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -190,6 +190,17 @@
     @ApiModelProperty("公司名称")
     private String companyName;
 
+    @ApiModelProperty("是否包车 1是2否")
+    private Integer zwNum;
+
+    public Integer getZwNum() {
+        return zwNum;
+    }
+
+    public void setZwNum(Integer zwNum) {
+        this.zwNum = zwNum;
+    }
+
     public String getCompanyName() {
         return companyName;
     }
@@ -1075,6 +1086,7 @@
             orderInfoWarpper.setAbnormalImg(null != map.get("abnormalImg") ? map.get("abnormalImg").toString() : "");
             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.setOrderAdditionalFeeWarpper(list);
         }
         return orderInfoWarpper;

--
Gitblit v1.7.1