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

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderVehicleCrosstown.java

@@ -137,7 +137,5 @@ public class OrderVehicleCrosstown {
 
     private String userLicenseImg;
 
-    private String checkUser;
-
-    private String checkTel;
+    private String checkUserInfo;
 }
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/CheckUserInfoDto.java

+package com.xxfc.platform.order.pojo.order;
+
+import lombok.Data;
+
+@Data
+public class CheckUserInfoDto {
+	private Integer id;
+	private String username;
+	private String telephone;
+}

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

@@ -24,6 +24,7 @@ import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.OrderVehicaleCrosstownMapper;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
+import com.xxfc.platform.order.pojo.order.CheckUserInfoDto;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
 import com.xxfc.platform.universal.constant.DictionaryKey;
@@ -249,6 +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();
         //调用车辆管理的出车还车
         //出车
@@ -258,17 +268,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleDepartureVo.setDepartureBranchCompanyId(orderRentVehicleDetail.getStartCompanyId());
             vehicleDepartureVo.setExpectArrivalBranchCompanyId(orderRentVehicleDetail.getEndCompanyId());
             vehicleDepartureVo.setMileage(orderVehicleCrosstownDto.getMileage());
-            if (appUserDTO != null) {
-                vehicleDepartureVo.setUser(appUserDTO.getNickname());
-                vehicleDepartureVo.setUserTel(appUserDTO.getUsername());
-            } else {
-                vehicleDepartureVo.setUser("APP用戶");
-                vehicleDepartureVo.setUserTel("13656235623");
-            }
-            vehicleDepartureVo.setUse("用户租车");
             vehicleDepartureVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
-            vehicleDepartureVo.setCheckMan(orderVehicleCrosstownDto.getCheckUser());
-            vehicleDepartureVo.setCheckManTel(orderVehicleCrosstownDto.getCheckTel());
+            if (checkUserInfoDto != null) {
+                vehicleDepartureVo.setCheckMan(checkUserInfoDto.getUsername());
+                vehicleDepartureVo.setCheckManTel(checkUserInfoDto.getTelephone());
+            }
+
             try {
                 RestResponse restResponse = vehicleFeign.departureBySmall(vehicleDepartureVo);
                 log.error("返回信息： " + restResponse.toString());
@@ -280,8 +285,10 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleArrivalVo.setVehicleId(orderRentVehicleDetail.getVehicleId());
             vehicleArrivalVo.setArrivalBranchCompanyId(userDTO.getCompanyId());
             vehicleArrivalVo.setMileage(orderVehicleCrosstownDto.getMileage());
-            vehicleArrivalVo.setRecycleMan(orderVehicleCrosstownDto.getCheckUser());
-            vehicleArrivalVo.setRecycleManTel(orderVehicleCrosstownDto.getCheckTel());
+            if (checkUserInfoDto != null) {
+                vehicleArrivalVo.setRecycleMan(checkUserInfoDto.getUsername());
+                vehicleArrivalVo.setRecycleManTel(checkUserInfoDto.getTelephone());
+            }
             vehicleArrivalVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
             try {
                 RestResponse restResponse = vehicleFeign.arrivalBySmall(vehicleArrivalVo);
@@ -332,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));
@@ -349,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);

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

@@ -11,7 +11,6 @@ import com.github.wxiaoqi.security.admin.constant.enumerate.MemberEnum;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.constant.CommonConstants;
-import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -48,13 +47,16 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.admin.constant.enumerate.MemberEnum.*;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
-import static com.xxfc.platform.order.contant.enumerate.ItemTypeEnum.*;
+import static com.xxfc.platform.order.contant.enumerate.ItemTypeEnum.ACCOMPANY;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 @Service
@@ -499,7 +501,6 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         //根据车型、时间、距离，门店，预定车辆
         RentVehicleBookDTO rentVehicleBookDTO = BeanUtil.toBean(detail.getBookVehicleVO(), RentVehicleBookDTO.class);
         rentVehicleBookDTO.setModelId(detail.getModelId());
-        rentVehicleBookDTO.setUserName(BaseContextHandler.getName());
         rentVehicleBookDTO.setLiftCompany(detail.getStartCompanyId());
         rentVehicleBookDTO.setLiftAddr(detail.getStartAddr());
         rentVehicleBookDTO.setRetCompany(detail.getEndCompanyId());
@@ -509,6 +510,10 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         rentVehicleBookDTO.setNumberPlate(numberPlate);
         rentVehicleBookDTO.setStatus(status);
         rentVehicleBookDTO.setUseType(detail.getUseType());
+        if (detail.getAppUserDTO() != null) {
+            rentVehicleBookDTO.setVehicleUserPhone(detail.getAppUserDTO().getUsername());
+            rentVehicleBookDTO.setVehicleUsername(detail.getAppUserDTO().getRealname());
+        }
 
         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

@@ -4,14 +4,9 @@ import com.github.wxiaoqi.security.common.vo.PageParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.Instant;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.util.List;
 import java.util.Map;
 
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.DATE_TIME_LINE_FORMATTER;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.YMR_SLASH_FORMATTER;
 
 @Data
@@ -74,6 +69,11 @@ public class RentVehicleBookDTO extends PageParam {
     @ApiModelProperty("用户名")
     private String userName;
 
+    //使用人姓名
+    private String vehicleUsername;
+    //使用人电话
+    private String vehicleUserPhone;
+
     @ApiModelProperty("订单号")
     private String orderNo;