Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2

ace-common/pom.xml

@@ -209,6 +209,24 @@
             <artifactId>spring-boot</artifactId>
             <version>2.1.3.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+            <version>2.1.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+            <version>2.1.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-core</artifactId>
+            <version>10.1.0</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

ace-common/src/main/java/com/github/wxiaoqi/security/common/config/feign/FeignConfig.java

+package com.github.wxiaoqi.security.common.config.feign;
+
+import feign.Logger;
+import feign.codec.Decoder;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.support.ResponseEntityDecoder;
+import org.springframework.cloud.openfeign.support.SpringDecoder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+//@Configuration
+public class FeignConfig {
+
+    @Bean
+    Logger.Level feignLoggerLevel() {
+        return Logger.Level.FULL;
+    }
+
+    @Bean
+    public Decoder feignDecoder() {
+        return new ResponseEntityDecoder(new SpringDecoder(feignHttpMessageConverter()));
+    }
+
+    public ObjectFactory<HttpMessageConverters> feignHttpMessageConverter() {
+        final HttpMessageConverters httpMessageConverters = new HttpMessageConverters(new XXMappingJackson2HttpMessageConverter());
+        return new ObjectFactory<HttpMessageConverters>() {
+            @Override
+            public HttpMessageConverters getObject() throws BeansException {
+                return httpMessageConverters;
+            }
+        };
+    }
+
+    public class XXMappingJackson2HttpMessageConverter extends MappingJackson2HttpMessageConverter {
+        XXMappingJackson2HttpMessageConverter(){
+            List<MediaType> mediaTypes = new ArrayList<>();
+            mediaTypes.add(MediaType.valueOf(MediaType.TEXT_HTML_VALUE + ";charset=UTF-8nnn")); //关键
+            setSupportedMediaTypes(mediaTypes);
+        }
+    }
+
+}
\ No newline at end of file

ace-common/src/main/java/com/github/wxiaoqi/security/common/config/global/GlobalBasicConfiguration.java

 package com.github.wxiaoqi.security.common.config.global;
 
+import com.github.wxiaoqi.security.common.handler.GlobalExceptionHandler;
+import com.github.wxiaoqi.security.common.handler.PlatformExceptionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
 
 
@@ -13,6 +17,17 @@ public class GlobalBasicConfiguration implements ApplicationRunner{
 	private static Logger log = LoggerFactory.getLogger(GlobalBasicConfiguration.class);
 	private static Environment env;
 
+	@Bean
+	@ConditionalOnMissingBean
+	private GlobalExceptionHandler addGlobalExceptionHandler() {
+		return new GlobalExceptionHandler();
+	}
+	@Bean
+	@ConditionalOnMissingBean
+	private PlatformExceptionHandler addPlatformExceptionHandler() {
+		return new PlatformExceptionHandler();
+	}
+
 	@Autowired
 	private void setEnv(Environment env) {
 		GlobalBasicConfiguration.env = env;

ace-common/src/main/java/com/github/wxiaoqi/security/common/config/RabbitCommonConfig.java → ace-common/src/main/java/com/github/wxiaoqi/security/common/config/rabbit/RabbitCommonConfig.java

-package com.github.wxiaoqi.security.common.config;
+package com.github.wxiaoqi.security.common.config.rabbit;
 
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.common.config.rabbit.BindDTO;

ace-common/src/main/java/com/github/wxiaoqi/security/common/filter/AcceptFilter.java

@@ -7,7 +7,7 @@ import ch.qos.logback.core.spi.FilterReply;
 public class AcceptFilter extends Filter<ILoggingEvent> {
 	@Override
 	public FilterReply decide(ILoggingEvent event) {
-		if(event.getLoggerName().startsWith("com.xxfc.platform") || event.getLoggerName().startsWith("com.github.wxiaoqi")) {
+		if(event.getLoggerName().startsWith("com.xxfc.platform") || event.getLoggerName().startsWith("com.github.wxiaoqi") || event.getLoggerName().contains("Exception")) {
 			return FilterReply.ACCEPT;
 		} else {
 			return FilterReply.DENY;

ace-common/src/main/java/com/github/wxiaoqi/security/common/filter/DenyFilter.java

@@ -7,7 +7,7 @@ import ch.qos.logback.core.spi.FilterReply;
 public class DenyFilter extends Filter<ILoggingEvent> {
 	@Override
 	public FilterReply decide(ILoggingEvent event) {
-		if (event.getLoggerName().startsWith("com.alibaba.nacos") || event.getLoggerName().startsWith("com.xxfc.platform") || event.getLoggerName().startsWith("com.github.wxiaoqi")) {
+		if (event.getLoggerName().startsWith("com.alibaba.nacos") || event.getLoggerName().startsWith("com.xxfc.platform") || event.getLoggerName().startsWith("com.github.wxiaoqi") || event.getLoggerName().contains("Exception")) {
 				return FilterReply.DENY;
 		} else {
 			return FilterReply.ACCEPT;

ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/PlatformExceptionHandler.java

@@ -3,10 +3,13 @@ package com.github.wxiaoqi.security.common.handler;
 
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 @RestControllerAdvice("com.xxfc.platform")
+@Slf4j
 public class PlatformExceptionHandler {
 
     @ExceptionHandler(value = {BaseException.class})
@@ -18,4 +21,25 @@ public class PlatformExceptionHandler {
         return new BaseResponse(400,e.getMessage());
     }
 
+    //服务器异常
+    @ExceptionHandler(Exception.class)
+    public ObjectRestResponse<?> exceptionHandler(Exception e){
+        Throwable cause = e.getCause();
+        if(cause != null && cause.toString().contains("Exception")) {
+            log.error(cause.getMessage(), e);
+            return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e.getMessage());
+        }
+        log.error("Server exception: ", e);
+        return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e.getMessage());
+    }
+
+    protected ObjectRestResponse<?> assembleResult(ObjectRestResponse<?> error, String msg) {
+        log.debug("Exception: " + msg);
+        return error;
+    }
+
+    protected ObjectRestResponse<?> assembleResult(ObjectRestResponse<?> error, Throwable e) {
+        return assembleResult(error, e.getClass().getSimpleName() + ": " + e.getMessage());
+    }
+
 }

ace-common/src/main/java/com/github/wxiaoqi/security/common/log/Impl/CommonLogServiceImpl.java

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.common.log.entity.LogEntity;
 import com.github.wxiaoqi.security.common.log.entity.XxLogEntity;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +26,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 @Service
+@Slf4j
 public class CommonLogServiceImpl implements CommonLogService {
 
     @Value("${spring.application.name}")
@@ -86,6 +88,9 @@ public class CommonLogServiceImpl implements CommonLogService {
         }
         @Override
         public void run() {
+            if(!xxLogEntity.getServletPath().contains("/vehicleInfo/app/unauth/getVehiclePlanList")) {
+                log.info("用户请求信息：xxLogEntity = {}", xxLogEntity.toString());
+            }
             mongoTemplate.insert(xxLogEntity, xxLogEntity.getMongoKey());
         }
     }

ace-common/src/main/java/com/github/wxiaoqi/security/common/log/entity/XxLogEntity.java

@@ -14,13 +14,13 @@ import java.util.Date;
 public class XxLogEntity implements Serializable {
 
     private String app;
+    private String method;
+    private String createDate;
     private String servletPath;
+    private String requestPath;
     private String requestData;
     private String responseData;
-    private String createDate;
     private String endDate;
-    private String requestPath;
-    private String method;
     private String mongoKey;
 
     public XxLogEntity() {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java

@@ -25,6 +25,7 @@ import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.lang.reflect.InvocationTargetException;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -257,4 +258,10 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
     }
 
 
+    public void deleteByUserIds(Collection<Integer> userIds) {
+        Example example = new Example(BaseUserMember.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andIn("userId",userIds);
+        mapper.deleteByExample(example);
+    }
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletBiz.java

@@ -364,4 +364,10 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
         return  ObjectRestResponse.succ();
   }
 
+    public void deleteByUserIds(Collection<Integer> userIds) {
+        Example example =new Example(MyWallet.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andIn("userId",userIds);
+        mapper.deleteByExample(example);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletCathBiz.java

@@ -126,4 +126,11 @@ public class MyWalletCathBiz extends BaseBiz<MyWalletCathMapper, MyWalletCath> {
     public WalletCathSumDto sumCathAmount(Integer userId,Integer type){
         return  mapper.sumCathAmount(userId,type);
     }
+
+    public void deleteByUserIds(Collection<Integer> userIds) {
+        Example example = new Example(MyWalletCath.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andIn("userId",userIds);
+        mapper.deleteByExample(example);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/RabbitAdminConfig.java

 package com.github.wxiaoqi.security.admin.config;
 
-import com.github.wxiaoqi.security.common.config.RabbitCommonConfig;
+import com.github.wxiaoqi.security.common.config.rabbit.RabbitCommonConfig;
 import com.github.wxiaoqi.security.common.config.rabbit.BindDTO;
-import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import org.springframework.context.annotation.Configuration;
 
 import java.util.ArrayList;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/DataController.java

 package com.github.wxiaoqi.security.admin.rest;
 
-import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
-import com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz;
-import com.github.wxiaoqi.security.admin.biz.AppUserRelationBiz;
-import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
+import com.github.wxiaoqi.security.admin.biz.*;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.feign.ActivityFeign;
+import com.xxfc.platform.order.feign.OrderFeign;
+import lombok.RequiredArgsConstructor;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.PostConstruct;
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * @author libin
@@ -22,42 +24,55 @@ import java.util.*;
  * @description
  * @data 2019/7/24 15:11
  */
-@ConditionalOnProperty(prefix = "data.clean", name = "enable",havingValue = "true")
+@ConditionalOnProperty(prefix = "data.clean", name = "enable", havingValue = "true")
+@RequiredArgsConstructor(onConstructor = @__({@Autowired}))
 @RestController
 @RequestMapping("/app/unauth/user_data")
 public class DataController {
 
-    @PostConstruct
-    public void init(){
-        System.out.println("启动了****************************");
-    }
+    private final AppUserLoginBiz appUserLoginBiz;
+
+    private final AppUserDetailBiz appUserDetailBiz;
+
+    private final AppUserRelationBiz appUserRelationBiz;
+
+    private final AppUserSellingWaterBiz appUserSellingWaterBiz;
+
+    private final ActivityFeign activityFeign;
 
-    @Autowired
-    private AppUserLoginBiz appUserLoginBiz;
+    private final MyWalletBiz walletBiz;
 
-    @Autowired
-    private AppUserDetailBiz appUserDetailBiz;
+    private final MyWalletCathBiz walletCathBiz;
 
-    @Autowired
-    private AppUserRelationBiz appUserRelationBiz;
+    private final BaseUserMemberBiz userMemberBiz;
 
-    @Autowired
-    private AppUserSellingWaterBiz appUserSellingWaterBiz;
+    private final OrderFeign orderFeign;
 
-    @Autowired
-    private ActivityFeign activityFeign;
 
     @GetMapping("/clearwithphone")
     public ObjectRestResponse<Void> clearData(@RequestParam("phones") List<String> phons) {
 
         Map<String, Integer> phoneAndUserIdMapByPhones = appUserLoginBiz.findPhoneAndUserIdMapByPhones(phons);
-        if (Objects.nonNull(phoneAndUserIdMapByPhones)){
+        if (Objects.nonNull(phoneAndUserIdMapByPhones)) {
             Collection<Integer> userIds = phoneAndUserIdMapByPhones.values();
+            //1.删除登录表信息
             appUserLoginBiz.deleteByPhones(phons);
+            //2.删除用户详情信息
             appUserDetailBiz.deleteByUserIds(userIds);
+            //3.删除用户关系表信息
             appUserRelationBiz.deleteByMemberIds(userIds);
+            //4.删除用户钱包
+            walletBiz.deleteByUserIds(userIds);
+            //5.删除用户提现记录
+            walletCathBiz.deleteByUserIds(userIds);
+            //6.删除会员信息
+            userMemberBiz.deleteByUserIds(userIds);
+            //7.删除佣金数据
             appUserSellingWaterBiz.deleteByMemberIds(userIds);
-            activityFeign.clearDate(new ArrayList<>(userIds));
+            //8.清除活动和用户优惠券信息
+            activityFeign.clearDate(new ArrayList(userIds));
+            //9.消除租车订单与旅游订单信息
+//            orderFeign.clearDateByUserIds(new ArrayList(userIds));
         }
         return ObjectRestResponse.succ();
     }
@@ -66,7 +81,7 @@ public class DataController {
     public ObjectRestResponse<Void> clearRelationphone(@RequestParam("phones") List<String> phons) {
 
         Map<String, Integer> phoneAndUserIdMapByPhones = appUserLoginBiz.findPhoneAndUserIdMapByPhones(phons);
-        if (Objects.nonNull(phoneAndUserIdMapByPhones)){
+        if (Objects.nonNull(phoneAndUserIdMapByPhones)) {
             Collection<Integer> userIds = phoneAndUserIdMapByPhones.values();
             appUserRelationBiz.deleteByMemberIds(userIds);
             appUserSellingWaterBiz.deleteByMemberIds(userIds);

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RabbitActivityConfig.java

 package com.xxfc.platform.activity.config;
 
-import com.github.wxiaoqi.security.common.config.RabbitCommonConfig;
+import com.github.wxiaoqi.security.common.config.rabbit.RabbitCommonConfig;
 import com.github.wxiaoqi.security.common.config.rabbit.BindDTO;
-import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import org.springframework.context.annotation.Configuration;
 
 import java.util.ArrayList;

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

@@ -31,6 +31,11 @@ public class OrderPageVO extends BaseOrder {
 
     private String telephone;
 
+    /**
+     * 車輛編碼
+     */
+    private Integer code;
+
     /**
      * 是否是用户匹配公司
      */

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

@@ -94,12 +94,12 @@ public class OrderTourVerificationBiz{
 
         // 出发时间 是否已经发车
         Date departureDate = tourFeign.selectDepartureDataBySpeId(tourDetail.getSpePriceId());
-        Long departureTime = tourFeign.selectDepartureTimeByStartCompanyIdAndRouteId(tourDetail.getStartCompanyId(), tourDetail.getGoodId());
+        //Long departureTime = tourFeign.selectDepartureTimeByStartCompanyIdAndRouteId(tourDetail.getStartCompanyId(), tourDetail.getGoodId());
         Integer departureStatus = tourFeign.selectDepartureStatusByVerificationId(verificationId);
-        LocalTime localDepartureTime = LocalTime.ofSecondOfDay(departureTime);
-        departureDate.setHours(localDepartureTime.getHour());
-        departureDate.setMinutes(localDepartureTime.getMinute());
-        departureDate.setSeconds(localDepartureTime.getSecond());
+        //LocalTime localDepartureTime = LocalTime.ofSecondOfDay(departureTime);
+        departureDate.setHours(0);
+        departureDate.setMinutes(0);
+        departureDate.setSeconds(0);
 
         if (Instant.now().toEpochMilli()<departureDate.toInstant().toEpochMilli()){
             return ObjectRestResponse.createFailedResultWithObj(400,"还未到发车时间",0);

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
@@ -163,16 +164,16 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
        if(orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
-           boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime());
+           boolean flag = getTodayTime(orderRentVehicleDetail.getEndTime());
            if (!flag) {
-               return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
+               return ObjectRestResponse.createFailedResult(3502, "今日不是交车日期");
            }
            if(userDTO.getCompanyId() != orderRentVehicleDetail.getStartCompanyId()) {
                return ObjectRestResponse.createFailedResult(3501, "无交车权限");
            }
        } else {
            if(userDTO.getCompanyId() != orderRentVehicleDetail.getEndCompanyId()) {
-               return ObjectRestResponse.createFailedResult(3501, "无收车权限");
+               return ObjectRestResponse.createFailedResult(3503, "无收车权限");
            }
        }
         if(baseOrder.getStatus() != -1) {
@@ -193,7 +194,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 }
 
         }
-
+        AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
         //调用车辆管理的出车还车
         //出车
         if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) { //交车
@@ -203,27 +204,36 @@ 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.setUser(userDTO.getUsername());
-            vehicleDepartureVo.setUserTel(userDTO.getTelPhone());
             vehicleDepartureVo.setCheckMan(orderVehicleCrosstownDto.getLicenseName());
             vehicleDepartureVo.setCheckManTel(orderVehicleCrosstownDto.getLicensePhone());
             try {
-                vehicleFeign.departureBySmall(vehicleDepartureVo);
+                RestResponse restResponse = vehicleFeign.departureBySmall(vehicleDepartureVo);
+                log.info("返回信息： " + restResponse);
             } catch (Exception e) {
                 e.printStackTrace();
-                return ObjectRestResponse.createFailedResult(500, e.getMessage());
+                return ObjectRestResponse.createFailedResult(1001, e.getMessage());
             }
-
         } else if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.ARRIVE.getCode() || orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //还车
-
             VehicleArrivalVo vehicleArrivalVo = new VehicleArrivalVo();
             vehicleArrivalVo.setVehicleId(orderRentVehicleDetail.getVehicleId());
             vehicleArrivalVo.setArrivalBranchCompanyId(userDTO.getCompanyId());
             vehicleArrivalVo.setMileage(orderVehicleCrosstownDto.getMileage());
             vehicleArrivalVo.setRecycleMan(userDTO.getName());
-            vehicleArrivalVo.setRecycleManTel(userDTO.getTelPhone());
+            vehicleArrivalVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
+            if(appUserDTO != null) {
+                vehicleArrivalVo.setRecycleManTel(appUserDTO.getUsername());
+            } else {
+                vehicleArrivalVo.setRecycleManTel("13565235623");
+            }
             try {
                 vehicleFeign.arrivalBySmall(vehicleArrivalVo);
             } catch (Exception e) {
@@ -262,7 +272,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             return ObjectRestResponse.succ(oldValue.get(0));
         } else if (oldValue.size() <= 0) {
             getOrderLicense(orderVehicleCrosstownDto);
-
             orderVehicleCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
             OrderVehicleCrosstown orderVehicleCrosstown = orderVehicleCrosstownBiz.selectOne(orderVehicleCrosstownDto);
             handleOrderStatus(baseOrder, orderRentVehicleDetail, orderVehicleCrosstown);
@@ -367,8 +376,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     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) {
+        if (current <= (time / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset() )+ 24 * 60 * 60 * 1000 -1) {
             return true;
         }
         return false;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/config/RabbitOrderConfig.java

 package com.xxfc.platform.order.config;
 
-import com.github.wxiaoqi.security.common.config.RabbitCommonConfig;
+import com.github.wxiaoqi.security.common.config.rabbit.RabbitCommonConfig;
 import com.github.wxiaoqi.security.common.config.rabbit.BindDTO;
 import org.springframework.context.annotation.Configuration;
 

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

@@ -235,6 +235,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
                 if (restResponse.getData() != null) {
                     orderPageVO.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
+                    orderPageVO.setCode(restResponse.getData().getCode());
                 }
             }
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/ResCode/ResCode.java

@@ -28,7 +28,9 @@ public enum ResCode {
     USERNAME_AND_TELE_NOT_NULL(104000, "使用人和电话不能为空"),
     VEHICLE_DEPARTURE_VEHICLE_UNEXIST(104001,"车辆不存在"),
     VEHICLE_DEPARTURE_VEHICLE_DISABLE(104002,"车辆不可用"),
+    VEHICLE_DEPARTURE_VEHICLE_DELETE(104007,"车辆已下架"),
     VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE(104003,"车辆未出车"),
+    VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED(104006,"车辆不在出车范围内，请按照预定日期出车！"),
 
     VEHICLE_BOOK_RECORD_IS_NOT_EXIST(104004, "预约记录不存在"),
     VEHICLE_UNBOOK_FAIL(104005, "取消预定失败！"),

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordVo.java

@@ -33,7 +33,11 @@ public class VehicleBookRecordVo extends VehicleBookRecord {
     private Integer liftStatus;
 
     private Integer retStatus;
+
     private Integer state;
+
+    private Integer code;
+
     List<VehicleUpkeepItem> vehicleUpkeepItems;
 
 }

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

@@ -3,12 +3,16 @@ package com.xxfc.platform.vehicle.biz;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.*;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.mapper.*;
 import com.xxfc.platform.vehicle.pojo.*;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -39,6 +43,12 @@ public class VehicleActiveService {
 
     @Autowired
     VehicleBookRecordBiz vehicleBookRecordBiz;
+
+    @Autowired
+    VehicleBiz vehicleBiz;
+
+    public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+
     @Value("${vehicle.mileage}")
     private Integer Mileage;
 
@@ -66,6 +76,8 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
+        //添加出车时间过滤 再出车开始时间前一天至结束时间内可以出车,并且预定记录为已审核状态
+        checkDateInvalide(departureVo);
         Integer MileageLift=vehicle.getMileageLastUpdate();
         Integer MileageLift1=departureVo.getMileage();
         if(MileageLift1==null){
@@ -118,6 +130,7 @@ public class VehicleActiveService {
                departureLog.setBookRecordId(departureVo.getBookRecordId());
                departureLog.setDepartureRemark(departureVo.getRemark());
                if(vehicleBookRecord != null) {
+                   departureLog.setDepartureBranchCompanyId(vehicleBookRecord.getLiftCompany());
                    departureLog.setUse(BookType.getByCode(vehicleBookRecord.getBookType()));
                    departureLog.setUser(vehicleBookRecord.getVehicleUsername());
                    departureLog.setUserTel(vehicleBookRecord.getVehicleUserPhone());
@@ -191,10 +204,17 @@ public class VehicleActiveService {
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
         if (Mileagerest != null && Mileagerest1 >= Mileagerest) {
+            VehicleBookRecord vehicleBookRecord = null;
+            if(arrivalVo.getBookRecordId() != null) {
+                vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
+                updateBookRecordStatus(vehicleBookRecord, 2);
+            }
 
             // 写入车辆公里数,还车分公司id
             vehicle.setMileageLastUpdate(Mileagerest1);
-            vehicle.setParkBranchCompanyId(arrivalVo.getArrivalBranchCompanyId());
+            if(vehicleBookRecord != null) {
+                vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
+            }
             vehicle.setExpectDestinationBranchCompanyId(0);
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
 
@@ -205,11 +225,6 @@ public class VehicleActiveService {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
             }
-            VehicleBookRecord vehicleBookRecord = null;
-            if(arrivalVo.getBookRecordId() != null) {
-                vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
-                updateBookRecordStatus(vehicleBookRecord, 2);
-            }
 
 
             // 出车记录
@@ -230,7 +245,7 @@ public class VehicleActiveService {
                 departureLog.setArrivalPic(arrivalVo.getArrivalPic());
                 departureLog.setArrivalRemark(arrivalVo.getRemark());
                 if(vehicleBookRecord != null) {
-                    departureLog.setDepartureBranchCompanyId(vehicleBookRecord.getRetCompany());
+                    departureLog.setArrivalBranchCompanyId(vehicleBookRecord.getRetCompany());
                 }
                 vehicleDepartureLogMapper.updateByPrimaryKeySelective(departureLog);
             // 车辆活动日志
@@ -243,12 +258,44 @@ public class VehicleActiveService {
             activeLog.setUpdateTime(new Date());
             vehicleActiveLogMapper.updateByPrimaryKeySelective(activeLog);
 
+            //取消预定时间 bookInfo和bookRecord
+            BookVehicleVO bookVehicleVo = new BookVehicleVO();
+            BeanUtils.copyProperties(vehicleBookRecord, bookVehicleVo);
+            bookVehicleVo.setNotCheckTimeLegal(Boolean.TRUE);
+            bookVehicleVo.setBookStartDate(null);
+            bookVehicleVo.setBookEndDate(null);
+            bookVehicleVo.setUnbookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DATE_TIME_FORMATTER));
+            bookVehicleVo.setUnbookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
+           try {
+               Boolean hasSuc = vehicleBiz.unbookVehicle(bookVehicleVo);
+               if(!hasSuc){
+                   throw new BaseException(ResCode.VEHICLE_UNBOOK_FAIL.getDesc(), ResCode.VEHICLE_UNBOOK_FAIL.getCode());
+               }
+           } catch ( Exception e) {
+                e.printStackTrace();
+           }
         } else {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
     }
 
+    //添加出车时间过滤 再出车开始时间前一天至结束时间内可以出车,并且预定记录为已审核状态
+    public void checkDateInvalide(VehicleDepartureVo arrivalVo) {
+        if(arrivalVo.getBookRecordId() != null) {
+            VehicleBookRecord   vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
+            if(vehicleBookRecord != null) {
+                DateTime startDate = new DateTime(vehicleBookRecord.getBookStartDate());
+                DateTime endDate = new DateTime(vehicleBookRecord.getBookEndDate());
+                if(!(startDate.minusDays(1).compareTo(DateTime.now()) <= 0 && DateTime.now().compareTo(endDate) <= 0 && vehicleBookRecord.getStatus() == VehicleBookRecordStatus.APPROVE.getCode())) {
+                    throw new BaseException(ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getDesc(),
+                            ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getCode());
+                }
+            }
+        }
+    }
+
+
     public void updateBookRecordStatus(VehicleBookRecord vehicleBookRecord, Integer type) {
 
         if(vehicleBookRecord != null) {

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

@@ -416,10 +416,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if(vehicle == null) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(), ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode());
         }
-        if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
+        if (vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode())) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
+        if (vehicle.getIsDel() == 1) {
+            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DELETE.getDesc(),
+                    ResCode.VEHICLE_DEPARTURE_VEHICLE_DELETE.getCode());
+        }
         if(StringUtils.isBlank(bookVehicleVo.getBookStartDate()) || StringUtils.isBlank(bookVehicleVo.getBookEndDate())) {
             throw new BaseException(ResultCode.DATE_TIME_IS_NULL);
         }
@@ -757,7 +761,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if(vehicle == null) {
             return false;
         }
-        if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
+        if (vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode())) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
@@ -783,13 +787,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 stringBuilder.append("保养");
                 break;
         }
-        List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
-        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
-            stringBuilder.append("中，使用人：");
-            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
-            stringBuilder.append(" 使用人电话：");
-            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
-        }
+//        List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
+//        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
+//            stringBuilder.append("中，使用人：");
+//            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
+//            stringBuilder.append(" 使用人电话：");
+//            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
+//        }
         return stringBuilder.toString();
     }
 
@@ -899,25 +903,23 @@ 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(!flag) {
+                   vehicleBookHourInfos.get(0).setBookedHour((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()));
+                   if((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()) == 0) {
+                       if(!flag) { //解决重复执行的问题
                            Integer effected = vehicleBookInfoMapper.updateBookedInfo(params);
                            if (effected < 1) {
                                return Boolean.FALSE;
-                       } else {
+                           }
                            flag = true;
-                           continue;
                        }
+
                    }
-               } else {
-                   vehicleBookHourInfos.get(0).setBookedHour((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()));
                    int effect = vehicleBookHourInfoBiz.updateByIdRe(vehicleBookHourInfos.get(0));
-                   if (effect < 1) {
+                   if (effect < 0) {
                        return Boolean.FALSE;
                    } else {
                        continue;
                    }
-               }
             } else {
                 return Boolean.FALSE;
             }

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

@@ -400,7 +400,7 @@
             parameterType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordQueryVo">
         select bc3.name parkCompanyName,bc4.name subordinateBranchName, conv(v4.booked_hour,10,2)
         startHour,conv(v5.booked_hour,10,2) endHour, bc1.`name` lift_company_name, bc2.`name` ret_company_name,
-        v3.number_plate,v1.*
+        v3.number_plate,v1.*,v3.code
         from vehicle_book_record v1
         LEFT JOIN vehicle_book_hour_info v4 on v4.book_record_id = v1.id and YEAR(v4.year_month_day) =
         YEAR(v1.book_start_date) AND MONTH(v4.year_month_day) = MONTH(v1.book_start_date) AND DAY(v4.year_month_day)
@@ -421,6 +421,9 @@
             <if test="numberPlate != null">
                 and v3.number_plate = #{numberPlate}
             </if>
+            <if test="code != null">
+                and v3.code = #{code}
+            </if>
             <if test="bookType != null">
                 and v1.book_type = #{bookType}
             </if>
@@ -444,7 +447,7 @@
     <select id="getBookRecordInfo" resultMap="searchBookRecord" parameterType="java.util.Map">
         select  (CASE v1.lift_company WHEN #{userCompany} THEN 1 ELSE 0 end) liftStatus,(CASE v1.ret_company WHEN
         #{userCompany} THEN 1 ELSE 0 end) retStatus,bc4.name subordinateBranchName, bc1.`name` lift_company_name,
-        bc2.`name` ret_company_name, v3.number_plate,v1.*
+        bc2.`name` ret_company_name, v3.number_plate,v1.*,v3.code
         from vehicle_book_record v1
         LEFT JOIN branch_company bc1 ON v1.lift_company = bc1.id
         LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
@@ -482,6 +485,9 @@
             <if test="status != null and status == -1 ">
                 and v4.state = 1
             </if>
+            <if test="code != null">
+                and v3.code = #{code}
+            </if>
             and v1.book_user != -2
         </where>
         group by v1.id