Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/CrosstownTypeEnum.java

@@ -6,6 +6,7 @@ import java.util.Map;
 public enum CrosstownTypeEnum {
     DEPARTURE(1, "交车"),
     ARRIVE(2, "还车"),
+    FIXED_LOSS(3, "定损"),
     ;
     /**
      * 编码

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderStatusEnum.java

@@ -11,6 +11,7 @@ public enum OrderStatusEnum {
     ORDER_TOSTART(4, "待进行（待出行/租车已支付）"),
     ORDER_WAIT(5, "出行中（进行中）"),
     ORDER_FINISH(6, "已完成"),
+    ORDER_FIXED_LOSS(-1, "定损"),
     ;
     /**
      * 编码

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

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.user.UserInfoBiz;
 import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.entity.OrderUserLicense;
@@ -91,6 +92,7 @@ public class OrderVehicalCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             return ObjectRestResponse.createFailedResult(500,"订单不存在！");
         }
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
+        //调用车辆管理的出车还车
         //出车
         if(orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) { //交车
             VehicleDepartureVo vehicleDepartureVo = new VehicleDepartureVo();
@@ -121,7 +123,7 @@ public class OrderVehicalCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         } else if(oldValue .size() <= 0) {
             getOrderLicense(orderVehicleCrosstownDto);
             orderVehicalCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
-            handleOrderStatus(baseOrder, orderRentVehicleDetail);
+            handleOrderStatus(baseOrder, orderRentVehicleDetail, orderVehicleCrosstownDto.getType());
             RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
             if(restResponse.getData() != null) {
                 orderVehicleCrosstownDto.setVehicleNumberPlat(restResponse.getData().getNumberPlate());
@@ -131,14 +133,23 @@ public class OrderVehicalCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         return ObjectRestResponse.createDefaultFail();
     }
 
-    private void handleOrderStatus(BaseOrder baseOrder, OrderRentVehicleDetail orderRentVehicleDetail) {
+    private void handleOrderStatus(BaseOrder baseOrder, OrderRentVehicleDetail orderRentVehicleDetail, Integer type) {
         //交车完成 设置订单状态为出行中
-        if (baseOrder.getStatus() == 4) {
+        if (baseOrder.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode()) {//交车
             //判断是否是今日交车
-            baseOrder.setStatus(5);
+            baseOrder.setStatus(OrderStatusEnum.ORDER_WAIT.getCode());
             baseOrderBiz.updateSelectiveById(baseOrder);
-        } else if (baseOrder.getStatus() == 5) {
-            baseOrder.setStatus(6);
+        } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_WAIT.getCode()) { //还车
+            if(type == CrosstownTypeEnum.ARRIVE.getCode()) {//不定损直接还车
+                baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
+                baseOrderBiz.updateSelectiveById(baseOrder);
+                baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
+            } else  if(type == CrosstownTypeEnum.FIXED_LOSS.getCode()){ //定损还车
+                baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
+                baseOrderBiz.updateSelectiveById(baseOrder);
+            }
+        } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_FIXED_LOSS.getCode()) {//定损后还车
+            baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
             baseOrderBiz.updateSelectiveById(baseOrder);
             baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
         }

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

@@ -55,10 +55,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
@@ -123,8 +120,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @IgnoreUserToken
     public ObjectRestResponse<OrderAboutParamDTO> getOrderUnitPrice() {
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        return ObjectRestResponse.succ(new OrderAboutParamDTO(){{
-            setInsurePrice(new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.INSURE_PRICE).getDetail()));
+        return ObjectRestResponse.succ(new OrderAboutParamDTO() {{
+            setInsurePrice(new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.INSURE_PRICE).getDetail()));
         }});
     }
 
@@ -135,13 +132,13 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @IgnoreUserToken
     public ObjectRestResponse<OrderAboutParamDTO> getOrderParam() {
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        return ObjectRestResponse.succ(new OrderAboutParamDTO(){{
-            setInsurePrice(new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.INSURE_PRICE).getDetail()));
-            setActRent(new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ACT_RENT).getDetail()));
-            setActTour(new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ACT_TOUR).getDetail()));
-            setActMember(new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ACT_MEMBER).getDetail()));
-            setDamageSafe(new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.DAMAGE_SAFE).getDetail()));
-            setDriverPrice(new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.DRIVER_PRICE).getDetail()));
+        return ObjectRestResponse.succ(new OrderAboutParamDTO() {{
+            setInsurePrice(new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.INSURE_PRICE).getDetail()));
+            setActRent(new Long(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ACT_RENT).getDetail()));
+            setActTour(new Long(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ACT_TOUR).getDetail()));
+            setActMember(new Long(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ACT_MEMBER).getDetail()));
+            setDamageSafe(new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.DAMAGE_SAFE).getDetail()));
+            setDriverPrice(new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.DRIVER_PRICE).getDetail()));
         }});
     }
 
@@ -173,14 +170,14 @@ public class BaseOrderController extends CommonBaseController implements UserRes
                 dto.setEndTime(new Date().getTime());
             }
         }
-        if(StringUtils.isNotBlank(dto.getPhone())) {
+        if (StringUtils.isNotBlank(dto.getPhone())) {
             AppUserLogin appUserLogin = userFeign.one(dto.getPhone());
-            if(appUserLogin != null) {
+            if (appUserLogin != null) {
                 dto.setUserId(appUserLogin.getId());
             }
         }
         UserDTO userDTO = getAdminUserInfo();
-        if(userDTO == null) {
+        if (userDTO == null) {
             return ObjectRestResponse.succ(new PageDataVO<>());
         }
         List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
@@ -190,10 +187,10 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
         List<OrderListVo> list = pageDataVO.getData();
         List<Integer> userIds = list.stream().map(OrderListVo::getUserId).distinct().collect(Collectors.toList());
-       if(userIds != null && userIds.size() >0) {
+        if (userIds != null && userIds.size() > 0) {
             ObjectRestResponse<List<AppUserVo>> objectRestResponse = userFeign.getByUserIds(userIds);
             log.info("获取用户信息：objectRestResponse = {}", objectRestResponse.getData());
-           Map<String, AppUserVo> appUserVoMap = objectRestResponse.getData() == null? new HashMap<String, AppUserVo>()
+            Map<String, AppUserVo> appUserVoMap = objectRestResponse.getData() == null ? new HashMap<String, AppUserVo>()
                     : objectRestResponse.getData().parallelStream().collect(Collectors.toMap(v -> v.getUserid().toString(), v -> v));
 
             for (OrderListVo orderPageVO : list) {
@@ -208,10 +205,10 @@ public class BaseOrderController extends CommonBaseController implements UserRes
                     if (restResponse.getData() != null) {
                         orderPageVO.setVehicleNumberPlat(restResponse.getData().getNumberPlate());
                     }
-                   if(StringUtils.isNotBlank(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds())) {
+                    if (StringUtils.isNotBlank(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds())) {
                         List<OrderUserLicense> orderUserLicenses = orderUserLicenseBiz.selectByIds(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds()).getData();
 
-                       if(orderUserLicenses != null && orderUserLicenses.size() > 0) {
+                        if (orderUserLicenses != null && orderUserLicenses.size() > 0) {
                             OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
                             orderVehicleCrosstownDto.setLicenseIdCard(orderUserLicenses.get(0).getLicenseIdCard());
                             orderVehicleCrosstownDto.setLicenseImg(orderUserLicenses.get(0).getLicenseImg());
@@ -222,23 +219,28 @@ public class BaseOrderController extends CommonBaseController implements UserRes
                     }
 
                 }
-               if(orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getStartCompanyId()!= null && orderPageVO.getOrderRentVehicleDetail().getEndCompanyId() != null) {
+                if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getStartCompanyId() != null && orderPageVO.getOrderRentVehicleDetail().getEndCompanyId() != null) {
                     ObjectRestResponse<CompanyDetail> startResponse = vehicleFeign.getCompanyDetail(orderPageVO.getOrderRentVehicleDetail().getStartCompanyId());
-                    if(startResponse.getData() != null) {
+                    if (startResponse.getData() != null) {
                         orderPageVO.setStartCompanyName(startResponse.getData().getName());
                     }
 
                     ObjectRestResponse<CompanyDetail> restResponse = vehicleFeign.getCompanyDetail(orderPageVO.getOrderRentVehicleDetail().getEndCompanyId());
-                   if(restResponse.getData() != null) {
+                    if (restResponse.getData() != null) {
                         orderPageVO.setEndCompanyName(restResponse.getData().getName());
                     }
                 }
-
-               if(orderPageVO.getOrderTourDetail() != null && orderPageVO.getOrderTourDetail().getStartCompanyId()!= null) {
+                //旅游
+                if (orderPageVO.getOrderTourDetail() != null && orderPageVO.getOrderTourDetail().getStartCompanyId() != null) {
                     ObjectRestResponse<CompanyDetail> startResponse = vehicleFeign.getCompanyDetail(orderPageVO.getOrderTourDetail().getStartCompanyId());
-                   if(startResponse.getData() != null) {
+                    if (startResponse.getData() != null) {
                         orderPageVO.setStartCompanyName(startResponse.getData().getName());
                     }
+                    List<Integer> tourUserIds = Arrays.asList(orderPageVO.getOrderTourDetail().getTourUserIds().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+                    ObjectRestResponse<List<AppUserVo>> users = userFeign.getByUserIds(tourUserIds);
+                    if (users.getData() != null) {
+                        orderPageVO.getOrderTourDetail().setUserVoList(users.getData() == null? users.getData() : null);
+                    }
                 }
 
 
@@ -261,7 +263,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         }
         Query query = new Query(dto);
         PageDataVO<OrderPageVO> pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.getRentVehicle(query.getSuper()));
-        for(OrderPageVO orderPageVO : pageDataVO.getData()) {
+        for (OrderPageVO orderPageVO : pageDataVO.getData()) {
             if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
                 ObjectRestResponse<Vehicle> restResponse = vehicleFeign.get(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
                 log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
@@ -295,7 +297,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @IgnoreClientToken
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> get(@PathVariable String no) {
-        log.info("no:"+ no + ",时间戳："+ System.currentTimeMillis());
+        log.info("no:" + no + ",时间戳：" + System.currentTimeMillis());
         checkAppUser();
 
         //查询列表数据
@@ -304,7 +306,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         if (page.getData().isEmpty()) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
-        log.info("no:"+ no + ",时间戳："+ System.currentTimeMillis());
+        log.info("no:" + no + ",时间戳：" + System.currentTimeMillis());
         return new ObjectRestResponse<>().data(page.getData().get(0));
     }
 
@@ -313,7 +315,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @IgnoreClientToken
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> getOrderDetail(String orderNo) {
-        if(StringUtils.isBlank(orderNo)) {
+        if (StringUtils.isBlank(orderNo)) {
             return ObjectRestResponse.paramIsEmpty();
         }
         return baseOrderBiz.getOrderDetail(orderNo);
@@ -421,7 +423,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         //判断是否成功，并且订单是未支付状态，则添加支付编号和修改状态
         if (StrUtil.isNotBlank(dto.getOrderNo())) {
             baseOrderBiz.payNotifyHandle(dto.getOrderNo(), dto.getTradeNo(), dto.getType());
-        }else{
+        } else {
             log.error(" exception notifyUrl : " + JSONUtil.toJsonStr(dto));
         }
         return ObjectRestResponse.succ();
@@ -436,9 +438,10 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         rabbitProduct.sendDelayMessage(baseOrderBiz.selectById(93), 1000L * 60);
         return ObjectRestResponse.succ();
     }
+
     public UserDTO getAdminUserInfo() {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-        if(request.getHeader("Authorization") !=null) {
+        if (request.getHeader("Authorization") != null) {
             return userFeign.userinfoByToken(request.getHeader("Authorization")).getData();
         }
         return null;