修改租車訂單地址，修改车辆预定时添加订单号

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -41,6 +41,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
@@ -169,7 +170,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 ids.add(Integer.parseInt(orderPageVo.getOrderTourDetail().getTourUserIds()));
             }
             List<AppUserVo> list = userFeign.getByUserIds(ids).getData();
-            orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? null : list);
+            orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? new ArrayList<>() : list);
         }
         //设置保留金
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
@@ -259,7 +260,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 ids.add(Integer.parseInt(orderPageVo.getOrderTourDetail().getTourUserIds()));
             }
             List<AppUserVo> list = userFeign.getByUserIds(ids).getData();
-            orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? null : list);
+            orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? new ArrayList<>() : list);
         }
         //设置保留金
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CompanyDetail.java

@@ -14,9 +14,6 @@ public class CompanyDetail extends BranchCompany {
         StringBuilder detailAddrStr = new StringBuilder("");
         if(null != this.getSysRegions() && this.getSysRegions().size() > 0) {
             for(SysRegion sysRegion : this.getSysRegions()) {
-//                if(0 != detailAddrStr.length()) {
-//
-//                }
                 String name = sysRegion.getName()
                         .replace("省", "")
                         .replace("市", "")
@@ -27,7 +24,9 @@ public class CompanyDetail extends BranchCompany {
                 }
             }
         }
-
+        if(this.getAddrDetail().contains(detailAddrStr)) {
+            return this.getAddrDetail();
+        }
         detailAddrStr.append(this.getAddrDetail());
         return detailAddrStr.toString();
     }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/QueryVehicleWarningMsgVo.java

@@ -29,4 +29,6 @@ public class QueryVehicleWarningMsgVo {
     private Integer page;
 
     private Integer limit;
+
+    private Integer colorType;
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -367,11 +367,9 @@
     </select>
     <select id="getByVehicleId" parameterType="java.lang.String"
             resultType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo">
-       SELECT v1.*, conv(v2.booked_hour,10,2) startHour,conv(v3.booked_hour,10,2) endHour,bc2.name retCompanyName from vehicle_book_record v1
-        LEFT JOIN vehicle_book_hour_info v2 on v2.book_record_id = v1.id and YEAR(v2.year_month_day) = YEAR(v1.book_start_date) AND MONTH(v2.year_month_day) = MONTH(v1.book_start_date) AND DAY(v2.year_month_day) =DAY(v1.book_start_date)
-        LEFT JOIN vehicle_book_hour_info v3 on v3.book_record_id = v1.id and YEAR(v3.year_month_day) = YEAR(v1.book_end_date) AND MONTH(v3.year_month_day) = MONTH(v1.book_end_date) AND DAY(v3.year_month_day) =DAY(v1.book_end_date)
+       SELECT v1.*,bc2.name retCompanyName from vehicle_book_record v1
                LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
-        where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2  and v1.book_end_date
+        where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2
     </select>
     <select id="getByParam" parameterType="java.util.Map" resultMap="getVehicleMap">
         select v1.* from vehicle_book_record v1

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleWarningMsgMapper.xml

@@ -73,6 +73,12 @@
         <if test="numberPlate != null and numberPlate != '' ">
             and number_plate = #{numberPlate}
         </if>
+        <if test="type != null">
+            and type = #{type}
+        </if>
+        <if test="colorType != null">
+            and color_type = #{colorType}
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file