Merge branch 'master-order-departure' into dev

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

@@ -250,7 +250,15 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
 
         }
-
+        //添加验车人信息
+        JSONArray list = new JSONArray();
+        CheckUserInfoDto checkUserInfoDto = null;
+        if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getCheckUserInfo())) {
+             checkUserInfoDto = JSONObject.parseObject(orderVehicleCrosstownDto.getCheckUserInfo(), CheckUserInfoDto.class);
+            if (checkUserInfoDto != null) {
+                list.add(checkUserInfoDto);
+            }
+        }
         AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
         //调用车辆管理的出车还车
         //出车
@@ -261,12 +269,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleDepartureVo.setExpectArrivalBranchCompanyId(orderRentVehicleDetail.getEndCompanyId());
             vehicleDepartureVo.setMileage(orderVehicleCrosstownDto.getMileage());
             vehicleDepartureVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
-            if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getCheckUserInfo())) {
-                JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getCheckUserInfo());
-                if (jsonArray != null && jsonArray.size() > 0 && jsonArray.getObject(0, CheckUserInfoDto.class) != null) {
-                    vehicleDepartureVo.setCheckMan(jsonArray.getObject(0, CheckUserInfoDto.class).getUsername());
-                    vehicleDepartureVo.setCheckManTel(jsonArray.getObject(0, CheckUserInfoDto.class).getTelephone());
-                }
+            if (checkUserInfoDto != null) {
+                vehicleDepartureVo.setCheckMan(checkUserInfoDto.getUsername());
+                vehicleDepartureVo.setCheckManTel(checkUserInfoDto.getTelephone());
             }
 
             try {
@@ -280,12 +285,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleArrivalVo.setVehicleId(orderRentVehicleDetail.getVehicleId());
             vehicleArrivalVo.setArrivalBranchCompanyId(userDTO.getCompanyId());
             vehicleArrivalVo.setMileage(orderVehicleCrosstownDto.getMileage());
-            if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getCheckUserInfo())) {
-                JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getCheckUserInfo());
-                if (jsonArray != null && jsonArray.size() > 0 && jsonArray.getObject(0, CheckUserInfoDto.class) != null) {
-                    vehicleArrivalVo.setRecycleMan(jsonArray.getObject(0, CheckUserInfoDto.class).getUsername());
-                    vehicleArrivalVo.setRecycleManTel(jsonArray.getObject(0, CheckUserInfoDto.class).getTelephone());
-                }
+            if (checkUserInfoDto != null) {
+                vehicleArrivalVo.setRecycleMan(checkUserInfoDto.getUsername());
+                vehicleArrivalVo.setRecycleManTel(checkUserInfoDto.getTelephone());
             }
             vehicleArrivalVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
             try {
@@ -337,7 +339,13 @@ 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());
+            }
             getOrderLicense(orderVehicleCrosstownDto);
             handleOrderStatus(baseOrder, orderRentVehicleDetail, oldValue.get(0), appUserDTO);
             updateSelectiveByIdRe(oldValue.get(0));
@@ -354,6 +362,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
                 return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
             }
+            orderVehicleCrosstownDto.setCheckUserInfo(list.toJSONString());
             getOrderLicense(orderVehicleCrosstownDto);
             orderVehicleCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
             OrderVehicleCrosstown orderVehicleCrosstown = orderVehicleCrosstownBiz.selectOne(orderVehicleCrosstownDto);