Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

@@ -142,11 +142,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 orderPageVo.setUserCompanyStatus(true);
             }
             if (orderPageVo.getStatus() == 4) { //未交车
-                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
-                if (!flag) {
-                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
-                }
-
+//                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
+//                if (!flag) {
+//                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
+//                }
+                getDriverInfo(orderPageVo);
             } else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
                 getDriverInfo(orderPageVo);
                 getUserLicense(orderPageVo);
@@ -232,10 +232,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         }
         if (orderPageVo.getOrderRentVehicleDetail() != null) {
             if (orderPageVo.getStatus() == 4) { //未交车
-                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
-                if (!flag) {
-                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
-                }
+//                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
+//                if (!flag) {
+//                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
+//                }
                 getDriverInfo(orderPageVo);
             } else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
                 getDriverInfo(orderPageVo);

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

@@ -37,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
@@ -149,6 +150,20 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
 
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
+       if(orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
+           boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime());
+           if (!flag) {
+               return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
+           }
+           if(userDTO.getCompanyId() != orderRentVehicleDetail.getStartCompanyId()) {
+               return ObjectRestResponse.createFailedResult(3501, "无交车权限");
+           }
+       } else {
+           if(userDTO.getCompanyId() != orderRentVehicleDetail.getEndCompanyId()) {
+               return ObjectRestResponse.createFailedResult(3501, "无收车权限");
+           }
+       }
+
         if(baseOrder.getStatus() != -1) {
             Vehicle vehicle = null;
             RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
@@ -320,4 +335,13 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
         return illegalReserve;
     }
+
+    public boolean getTodayTime(Long time) {
+        long current = System.currentTimeMillis();
+        long startTime = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
+        if (time >= startTime && time <= startTime + 24 * 60 * 60 * 1000 - 1) {
+            return true;
+        }
+        return false;
+    }
 }

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

@@ -139,7 +139,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     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());
+                    List<Integer> tourUserIds = Arrays.asList(orderPageVO.getOrderTourDetail().getTourUserIds().split(",")).parallelStream().map(s -> Integer.valueOf(s.trim())).collect(Collectors.toList());
                     ObjectRestResponse<List<AppUserVo>> users = userFeign.getByUserIds(tourUserIds);
                     if (users.getData() != null) {
                         orderPageVO.getOrderTourDetail().setUserVoList(users.getData() == null? users.getData() : new ArrayList<>());

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -453,6 +453,7 @@
             <if test="zoneId !=null">
                 and bc2.zone_id = #{zoneId}
             </if>
+            and is_del != 1
         </where>
     </select>