Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DepositRefundRecord.java

@@ -69,9 +69,5 @@ public class DepositRefundRecord {
     @Transient
     Long rentDepositAutoRefundTime;
 
-    /**
-     * 客服电话
-     */
-    @Transient
-    private String customerPhone;
+
 }
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java

@@ -28,10 +28,15 @@ public class OrderVehicleCrosstownDto extends OrderVehicleCrosstown {
      * 驾驶人身份证号
      */
     private String licenseIdCard;
+    /**
+     * 客服电话
+     */
+    private String customerPhone;
 
     private String vehicleNumberPlat;
 
     private String username;
 
     List<DepositRefundRecord> depositRefundRecord;
+
 }

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.DepositRefundStatus;
@@ -11,6 +12,7 @@ import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +35,12 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
     BaseOrderBiz baseOrderBiz;
     @Autowired
     OrderRentVehicleBiz orderRentVehicleBiz;
+    @Autowired
+    UserFeign userFeign;
+
+    @Autowired
+    VehicleFeign vehicleFeign;
+
     @Autowired
     OrderVehicleCrosstownBiz orderVehicleCrosstownBiz;
 

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

@@ -27,6 +27,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.VehicleArrivalVo;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureVo;
 import lombok.extern.slf4j.Slf4j;
@@ -77,6 +78,15 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
         List<OrderVehicleCrosstownDto> list = mapper.selectByOrderId(orderVehicleCrosstownDto);
         for (OrderVehicleCrosstownDto value : list) {
+            if(value != null && value.getOrperaterId() != null && value.getType() != 1) {
+                UserDTO userDTO = userFeign.userinfoByUid(value.getOrperaterId()).getData();
+                if(userDTO != null) {
+                    CompanyDetail branchCompany = vehicleFeign.getCompanyDetail(userDTO.getCompanyId()).getData();
+                    if(branchCompany != null) {
+                        value.setCustomerPhone(branchCompany.getVehiceServicePhone());
+                    }
+                }
+            }
             updateCrossRecord(value);
             List<DepositRefundRecord> depositRefundRecords = orderDepositRefundRecordBiz.selectByCrossId(value.getId());
             value.setDepositRefundRecord(depositRefundRecords == null || depositRefundRecords.size() <= 0 ? null : depositRefundRecords);

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

@@ -5,7 +5,6 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleActiveType;
-import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.constant.VehicleDepartureState;
 import com.xxfc.platform.vehicle.constant.VehicleStatus;
 import com.xxfc.platform.vehicle.entity.*;

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

@@ -451,6 +451,7 @@
         LEFT JOIN vehicle v3 on v3.id = v1.vehicle_id
         LEFT JOIN branch_company bc3 on v3.park_branch_company_id = bc3.id
         LEFT JOIN branch_company bc4 on v3.subordinate_branch = bc4.id
+        LEFT JOIN vehicle_departure_log v4 on v4.book_record_id = v1.id
         <where>
             <if test="selectedMonth != null">
                 and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_end_date like
@@ -472,9 +473,12 @@
                     #{id}
                 </foreach>)
             </if>
-            <if test="status != null">
+            <if test="status != null and status != 0 and status != -1">
                 and v1.status = #{status}
             </if>
+            <if test="status != null and (status == 0 or status == -1)">
+                and v4.state = #{status}
+            </if>
             and v1.book_user != -2
         </where>
         group by v1.id