Merge remote-tracking branch 'origin/dev' into dev

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

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

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RefundMQHandler.java

@@ -5,6 +5,7 @@ import cn.hutool.json.JSONUtil;
 import com.rabbitmq.client.Channel;
 import com.xxfc.platform.order.biz.OrderAccountBiz;
 import com.xxfc.platform.order.biz.OrderRefundBiz;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -46,7 +47,10 @@ public class RefundMQHandler {
                     String msg = new String(message.getBody(), "UTF-8");
                     OrderMQDTO orderMQDTO = JSONUtil.toBean(msg, OrderMQDTO.class);
 
+                    //租车订单完成
+                    if(OrderTypeEnum.RENT_VEHICLE.getCode().equals(orderMQDTO.getType())) {
                         orderAccountBiz.refundPartDeposit(orderMQDTO);
+                    }
 
                     executorService.shutdown();
                     Long deliveryTag = (Long) headers.get(AmqpHeaders.DELIVERY_TAG);

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

@@ -10,7 +10,6 @@ import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.mapper.*;
 import com.xxfc.platform.vehicle.pojo.*;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -66,11 +65,11 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode());
         }
-        if (StringUtils.isBlank(departureVo.getCheckMan()) || StringUtils.isBlank(departureVo.getCheckManTel())) {
-            log.error("出车  核销人姓名不能为空！");
-            throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
-                    ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
-        }
+//        if (StringUtils.isBlank(departureVo.getCheckMan()) || StringUtils.isBlank(departureVo.getCheckManTel())) {
+//            log.error("出车  核销人姓名不能为空！");
+//            throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
+//                    ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
+//        }
         if (vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode()) || vehicle.getIsDel() == 1 || vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
             throw new BaseException(ResCode.VEHICLE_STATUS_IS_NOT_NORMAL.getDesc(),
                     ResCode.VEHICLE_STATUS_IS_NOT_NORMAL.getCode());
@@ -199,10 +198,10 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode());
         }
-        if (StringUtils.isBlank(arrivalVo.getRecycleMan()) || StringUtils.isBlank(arrivalVo.getRecycleManTel())) {
-            throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
-                    ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
-        }
+//        if (StringUtils.isBlank(arrivalVo.getRecycleMan()) || StringUtils.isBlank(arrivalVo.getRecycleManTel())) {
+//            throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
+//                    ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
+//        }
 //        if (!vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
 //            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
 //                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());