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

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

 package com.xxfc.platform.order.pojo.order;
 
-import com.xxfc.platform.order.entity.BaseOrder;
-import com.xxfc.platform.order.entity.OrderMemberDetail;
-import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
-import com.xxfc.platform.order.entity.OrderTourDetail;
+import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -32,4 +30,17 @@ public class OrderListVo extends BaseOrder {
 
     private String endCompanyName;
 
+    /**
+     * 是否是用户匹配公司
+     */
+    private boolean userCompanyStatus = false;
+
+    /**
+     * 违章预备金
+     */
+    private BigDecimal illegalReserve;
+
+
+    private List<OrderItem> items;
+
 }

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

@@ -25,6 +25,12 @@ public class OrderPageVO extends BaseOrder {
      */
     private String username;
 
+    private String startCompanyName;
+
+    private String endCompanyName;
+
+    private String telephone;
+
     /**
      * 是否是用户匹配公司
      */

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

@@ -38,6 +38,7 @@ import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -139,6 +140,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         if(orderPageVo.getStatus() <= 3 && orderPageVo.getStatus() != 2 && orderPageVo.getStatus() != -1) {
             return ObjectRestResponse.createFailedResult(ResCode.ORDER_DETAIL_IS_NOT_EXIST.getCode(), ResCode.ORDER_DETAIL_IS_NOT_EXIST.getDesc());
         }
+        AppUserDTO appUserVo = userFeign.userDetailById(orderPageVo.getUserId()).getData();
+        if(appUserVo != null) {
+            orderPageVo.setTelephone(appUserVo.getUsername());
+            orderPageVo.setUsername(appUserVo.getNickname());
+        }
         List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
         List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
 
@@ -159,10 +165,18 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 getDriverInfo(orderPageVo);
                 getUserLicense(orderPageVo);
             }
+            ObjectRestResponse<CompanyDetail> startResponse = vehicleFeign.getCompanyDetail(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId());
+            if (startResponse.getData() != null) {
+                orderPageVo.setStartCompanyName(startResponse.getData().getName());
+            }
 
-            RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVo.getOrderRentVehicleDetail().getVehicleId());
+            ObjectRestResponse<CompanyDetail> restResponse = vehicleFeign.getCompanyDetail(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId());
             if (restResponse.getData() != null) {
-                orderPageVo.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
+                orderPageVo.setEndCompanyName(restResponse.getData().getName());
+            }
+            RestResponse<Vehicle> response = vehicleFeign.findById(orderPageVo.getOrderRentVehicleDetail().getVehicleId());
+            if (response.getData() != null) {
+                orderPageVo.setVehicalNumberPlat(response.getData().getNumberPlate());
             }
         } else if (orderPageVo.getOrderTourDetail() != null) {
             List<Integer> ids = Lists.newArrayList();

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/MQSenderController.java

@@ -26,7 +26,6 @@ public class MQSenderController {
     @PostMapping(value = "/sendMessage")
     @ResponseBody
     public ObjectRestResponse sendMessage(@RequestBody SendMsgDTO dto) {
-        String string = "{\"integralRuleCode\":\"SHARE\", \"userId\":75}";
         return mqServiceBiZ.sendMessage(dto.getExchange(), dto.getRoutKey(), dto.getJson());
     }
 

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

@@ -854,11 +854,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             vehicleBookHourInfoDto.setVehicleId(vehicleId);
             List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
             if (vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
-               if((vehicleBookHourInfos.get(0).getBookedHour() & 0) == 0) {
-
+               if((vehicleBookHourInfos.get(0).getBookedHour() | 0) == 0) {
                    Integer effected = vehicleBookInfoMapper.updateBookedInfo(params);
-
+                   if (effected < 1) {
+                       return Boolean.FALSE;
+                   } else {
+                       continue;
                    }
+               } else {
                    vehicleBookHourInfos.get(0).setBookedHour((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()));
                    int effect = vehicleBookHourInfoBiz.updateByIdRe(vehicleBookHourInfos.get(0));
                    if (effect < 1) {
@@ -866,6 +869,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                    } else {
                        continue;
                    }
+               }
             } else {
                 return Boolean.FALSE;
             }

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

@@ -149,7 +149,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
 
     public static void main(String[] args) throws Exception{
         int b = 16744448;
-        Integer a = b & 0;
+        Integer a = b | 0;
         System.out.println(a);
     }