修改代码

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

@@ -19,6 +19,7 @@ import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.universal.vo.OrderRefundVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.jexl2.MapContext;
+import org.mockito.internal.util.collections.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -96,18 +97,24 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
             }});
 
             if(null == crosstown) {
-                throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, new HashSet<String>(){{
-                    add("退款第一部分押金失败，获取不了还车/定损记录，订单号："+ orderMQDTO.getId());
-                }});
+                throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("退款第一部分押金失败，获取不了还车/定损记录，订单号："+ orderMQDTO.getId()));
+            }
+
+            if(null == crosstown.getRestDeposit()
+                    || crosstown.getRestDeposit().subtract(illegalReserve).compareTo(BigDecimal.ZERO) < 0 ){
+                throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("退第一笔押金剩余金额异常，异常记录为："+ crosstown.getId()));
             }
+
             //还车扣除款 剩余的 钱，再减去违章预备金
             BigDecimal refundAmont = crosstown.getRestDeposit().subtract(illegalReserve);
             BigDecimal originalRefundAmount = crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
-            List<DedDetailDTO> dddList = JSONUtil.toBean(crosstown.getDedDetail(), List.class);
             String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章预备金："+ illegalReserve.toString();
+            if(null != crosstown.getDedDetail()) {
+                List<DedDetailDTO> dddList = JSONUtil.toBean(crosstown.getDedDetail(), List.class);
                 for(DedDetailDTO ddd : dddList) {
                     refundDesc += ", "+ ddd.getDeductions()+ ":"+ ddd.getCost();
                 }
+            }
             refundDesc += ")";
             refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.RESIDUE_ILLEGAL.getCode(), RefundTypeEnum.PART_DEPOSIT);
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -419,6 +419,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         rentVehicleBookDTO.setUserName(BaseContextHandler.getName());
         rentVehicleBookDTO.setLiftCompany(detail.getStartCompanyId());
         rentVehicleBookDTO.setLiftAddr(detail.getStartAddr());
+        rentVehicleBookDTO.setRetCompany(detail.getEndCompanyId());
         if(null != detail.getAccompanyItems()) {
             rentVehicleBookDTO.setSelectedAccItem(detail.getAccompanyItems().parallelStream().collect(Collectors.toMap(OrderAccompanyDTO::getId, OrderAccompanyDTO::getNum)));
         }

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

@@ -36,6 +36,12 @@ public class RentVehicleBookDTO extends PageParam {
     @ApiModelProperty("提车公司")
     private Integer liftCompany;
 
+    /**
+     * 还车分公司
+     */
+    @ApiModelProperty("还车分公司")
+    private Integer retCompany;
+
     /**
      * 目的地
      */

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

@@ -41,6 +41,12 @@ public class UsableVeicleDTO extends PageParam {
         @ApiModelProperty("停靠公司")
         String parkBranchCompanyId;
 
+        @ApiModelProperty("开始公司Id")
+        String startCompanyId;
+
+        @ApiModelProperty("结束公司Id")
+        String endCompanyId;
+
         @ApiModelProperty(hidden = true)
         Boolean yearNo4Where;
 

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

@@ -573,10 +573,19 @@
         </if>
         left join vehicle_model vm on v.model_id = vm.id
         left join branch_company bc on v.park_branch_company_id = bc.id
+        <if test="startCompanyId != null and endCompanyId != null ">
+            left join (
+                <include refid="aroundBookRecord"></include>
+            ) abr on v.`id` = abr.vehicle_id
+        </if>
         <if test=" catas != null ">
             left join vehicle_cata vc on vm.id = vc.vehicle_model_id
         </if>
         <where>
+            <!-- 若需根据预定日期条件查询，针对换为位操作  -->
+                <!-- yearNo4Where 标识时间参数是否用于where条件 -->
+            (abr.to_lift_company = null or (abr.to_lift_company = ))
+
             <!-- 若需根据预定日期条件查询，针对换为位操作  -->
                 <!-- yearNo4Where 标识时间参数是否用于where条件 -->
             <if test=" yearMonthAndParam !=null and yearNo4Where == null">
@@ -585,7 +594,13 @@
                     <include refid="yearMonthAndParamSql"></include>
                 </foreach>
             </if>
-
+            <if test="startCompanyId != null and endCompanyId != null ">
+                and (
+                    (abr.to_lift_company = null or abr.to_lift_company = #{startCompanyId})
+                    and
+                    (abr.to_return_company = null or abr.to_return_company = #{endCompanyId})
+                )
+            </if>
             <if test=" modelId != null ">
                 and v.model_id = #{modelId}
             </if>
@@ -611,4 +626,17 @@
                 )
     </sql>
 
+    <!-- 前后被预定的情况 -->
+    <sql id = "aroundBookRecord">
+        select sevbr.*
+        , vbre.ret_company as to_lift_company
+        , vbrs.lift_company as to_return_company
+        from
+        (select vehicle_id, max(if(book_end_date &lt; #{start_date_extend}, book_end_date, null)) as max_book_end_date, min(if(book_start_date &gt; #{end_date_extend}, book_start_date, null)) as min_book_start_date from vehicle_book_record where status != 4 and status != 6 group by vehicle_id) sevbr
+        left join vehicle_book_record vbre
+        on sevbr.vehicle_id = vbre.vehicle_id and sevbr.max_book_end_date = vbre.book_end_date and vbre.status != 4 and vbre.status != 6
+        left join vehicle_book_record vbrs
+        on sevbr.vehicle_id = vbrs.vehicle_id and sevbr.min_book_start_date = vbrs.book_start_date and vbrs.status != 4 and vbrs.status != 6;
+    </sql>
+
 </mapper>
\ No newline at end of file