Merge branch 'feature_chw_zjw2' into dev-chw

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

@@ -137,11 +137,6 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
             CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(specialRent.getStartCompanyId()).getData();
             specialRent.setStartCompanyName(companyDetail.getName());
             specialRent.setStartCityCode(companyDetail.getAddrCity());
-        }
-        if(null != specialRent.getEndCompanyId()) {
-            CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(specialRent.getEndCompanyId()).getData();
-            specialRent.setEndCompanyName(companyDetail.getName());
-            specialRent.setEndCityCode(companyDetail.getAddrCity());
             specialRent.setStartCityName(companyDetail.getCityName());
         }
         if(null != specialRent.getEndCompanyId()) {

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

@@ -71,4 +71,8 @@ public class VehicleVO extends Vehicle {
 
     private List<VehicleExtensionVO> vehicleExtensions;
 
+    private String manageProvinceName;
+
+    private String manageCityName;
+
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1635,6 +1635,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             vehicle.setId(UUID.randomUUID().toString());
             vehicle.setParkBranchCompanyId(vehicleApply.getSubordinateBranch());
             vehicle.setManageCompanyId(vehicleApply.getSubordinateBranch());
+            vehicle.setState(1);
             insertSelective(vehicle);
             vehicleId=vehicle.getId();
             vehicleBookInfoBiz.addVehicleBookInfo(vehicleId);

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

@@ -1462,7 +1462,9 @@
         c.`name` categoryName,
         bc.`name` as companyName,
         bc1.`leader` as manageCompanyLeader,
-        bc1.`leader_contact_info` as manageCompanyLeaderContact
+        bc1.`leader_contact_info` as manageCompanyLeaderContact,
+        bc1.province_name as manageProvinceName,
+        bc1.city_name as manageCityName
         <if test="lon != null and lat != null">
             ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
         </if>