Merge branch 'master-order-departure' into dev

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

@@ -339,13 +339,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
                 return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
             }
-
-            BeanUtil.copyProperties(orderVehicleCrosstownDto, oldValue.get(0), CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
             JSONArray jsonArray = JSONArray.parseArray(oldValue.get(0).getCheckUserInfo());
             if (jsonArray != null && checkUserInfoDto != null) {
                 jsonArray.add(checkUserInfoDto);
-                oldValue.get(0).setCheckUserInfo(jsonArray.toJSONString());
+                orderVehicleCrosstownDto.setCheckUserInfo(jsonArray.toJSONString());
             }
+            BeanUtil.copyProperties(orderVehicleCrosstownDto, oldValue.get(0), CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
             getOrderLicense(orderVehicleCrosstownDto);
             handleOrderStatus(baseOrder, orderRentVehicleDetail, oldValue.get(0), appUserDTO);
             updateSelectiveByIdRe(oldValue.get(0));