修改交还车接口

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderVehicleCrosstownController.java

@@ -55,6 +55,9 @@ public class OrderVehicleCrosstownController {
                 if(baseOrder.getStatus() == 4) {
                     baseOrder.setStatus(5);
                     baseOrderBiz.updateSelectiveById(baseOrder);
+                } else if(baseOrder.getStatus() == 5) {
+                    baseOrder.setStatus(6);
+                    baseOrderBiz.updateSelectiveById(baseOrder);
                 }
                 OrderVehicleCrosstownDto vehicleCrosstownDto = new OrderVehicleCrosstownDto();
                 BeanUtil.copyProperties(oldValue.get(0), vehicleCrosstownDto, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
@@ -70,8 +73,13 @@ public class OrderVehicleCrosstownController {
                 getOrderLicense(orderVehicleCrosstownDto);
                 orderVehicalCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
                 //交车完成 设置订单状态为出行中
-                baseOrder.setStatus(5);
-                baseOrderBiz.updateSelectiveById(baseOrder);
+                if(baseOrder.getStatus() == 4) {
+                    baseOrder.setStatus(5);
+                    baseOrderBiz.updateSelectiveById(baseOrder);
+                } else if(baseOrder.getStatus() == 5) {
+                    baseOrder.setStatus(6);
+                    baseOrderBiz.updateSelectiveById(baseOrder);
+                }
                 return ObjectRestResponse.succ(orderVehicleCrosstownDto);
             }
             return ObjectRestResponse.createDefaultFail();