Merge branch 'dev' into 'master'

dev-master-merge

See merge request !7

ace-common/src/main/java/com/github/wxiaoqi/security/common/constant/CommonConstants.java

@@ -24,4 +24,19 @@ public class CommonConstants {
     public static final String CONTEXT_KEY_USER_TOKEN = "currentUserToken";
     public static final String JWT_KEY_USER_ID = "userId";
     public static final String JWT_KEY_NAME = "name";
+
+    // 时间相关
+    public static final String DEFAULT = "yyyy/MM/dd";
+    public static final String YM = "yyyy/MM";
+    public static final String YMR_SLASH = "yyyy-MM-dd";
+    public static final String NO_SLASH = "yyyyMMdd";
+    public static final String YM_NO_SLASH = "yyyyMM";
+    public static final String DATE_TIME = "yyyy/MM/dd HH:mm:ss";
+    public static final String DATE_TIME_NO_SLASH = "yyyyMMddHHmmss";
+    public static final String DATE_HM = "yyyy/MM/dd HH:mm";
+    public static final String TIME = "HH:mm:ss";
+    public static final String HM = "HH:mm";
+    public static final String LONG_TIME = "HHmmss";
+    public static final String SHORT_TIME = "HHmm";
+    public static final String DATE_TIME_LINE = "yyyy-MM-dd HH:mm:ss";
 }

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/StringToolsUtil.java

+package com.github.wxiaoqi.security.common.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class StringToolsUtil {
+
+    /**
+     * 验证手机号码
+     * @param mobiles
+     * @return
+     */
+    public static boolean isMobileNO(  String mobiles){
+        boolean flag = false;
+        try{
+            if(StringUtils.isBlank(mobiles)) {
+                flag = false;
+            }
+            Pattern regex = Pattern.compile("^((16[0-9])|(13[0-9])|(15[^4,\\D])|(17[0-9])|(18[0-9])|(19[0-9]))\\d{8}$");
+            Matcher m = regex .matcher(mobiles);
+            flag = m.matches();
+        }catch(Exception e){
+            flag = false;
+        }
+        return flag;
+    }
+
+    /**
+     * 校验身份证
+     *
+     * @param idCard
+     * @return 校验通过返回true，否则返回false
+     */
+    public static boolean isIDCard(String idCard) {
+        if(StringUtils.isBlank(idCard)) {
+            return false;
+        }
+        String REGEX_ID_CARD = "(^\\d{18}$)|(^\\d{15}$)";
+        return Pattern.matches(REGEX_ID_CARD, idCard);
+    }
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/rest/UserRestInterface.java

@@ -35,4 +35,10 @@ public interface UserRestInterface {
             return null;
         }
     }
+
+    default void checkAdminUser(){
+        if(null == getAdminUserInfo()) {
+            throw new BaseException(ResultCode.DB_OPERATION_FAIL_CODE);
+        }
+    }
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/support/aop/TokenAop.java

@@ -70,6 +70,7 @@ public class TokenAop {
                 if (StringUtils.isEmpty(token)){
 //                   return ObjectRestResponse.createFailedResult(4004,"token不能为空");
                     args[i]= new AppUserDTO();
+                    break;
                 }
                args[i]= userFeign.userDetailByToken(token).getData();
                break;

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

@@ -2,24 +2,29 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
+import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.mapper.AppUserLoginMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.github.wxiaoqi.security.common.constant.UserConstant;
+import com.xxfc.platform.universal.entity.IdInformation;
+import com.xxfc.platform.universal.feign.MQSenderFeign;
+import com.xxfc.platform.universal.feign.ThirdFeign;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -36,6 +41,11 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     private static final  String WX_TYPE="wx";
     private static final  String QQ_TYPE="q";
 
+    @Autowired
+    ThirdFeign thirdFeign;
+    @Autowired
+    MQSenderFeign mqSenderFeign;
+
     @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     @Override
     public void insertSelective(AppUserLogin entity) {
@@ -62,6 +72,44 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         super.updateSelectiveById(entity);
     }
 
+    public Object test() {
+        threadRunner();
+        return "success";
+    }
+
+    public void threadRunner() {
+        List<AppUserLogin> list = mapper.selectAll();
+        ExecutorService executorService = Executors.newCachedThreadPool();
+        executorService.execute(new Runnable() {
+             @Override
+              public void run() {
+                 if(list != null && list.size() > 0) {
+                     for(AppUserLogin appUserLogin : list) {
+                         try {
+                             Thread.sleep(3000);
+                         } catch (Exception e){}
+                         IdInformation idInformation = thirdFeign.getOneByUserId(appUserLogin.getId());
+                         if(idInformation != null) { //实名认证
+                             JSONObject jsonObject = new JSONObject();
+                             jsonObject.put("userId", appUserLogin.getId());
+                             jsonObject.put("integralRuleCode", "CRETIFICATION");
+                             jsonObject.put("channelId", idInformation.getId());
+                             mqSenderFeign.sendMessage(RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
+                         }
+                         try {
+                             Thread.sleep(3000);
+                         } catch (Exception e){}
+                         JSONObject jsonObject = new JSONObject();
+                         jsonObject.put("userId", appUserLogin.getId());
+                         jsonObject.put("integralRuleCode", "REGISTER");
+                         jsonObject.put("channelId", appUserLogin.getId());
+                         mqSenderFeign.sendMessage(RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
+
+                     }
+                 }
+               }
+        });
+    }
 
     /**
      * 根据用户名获取用户信息

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

@@ -66,6 +66,16 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
             log.info("----userId==="+userId+"----parentId===="+parentId+"----自己不能成为自己的上线");
             return;
         }
+        AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId);
+        if (appUserVo==null){
+            log.info("----userId==="+userId+"----parentId===="+parentId+"----该用户不存在");
+            return;
+        }
+         appUserVo=userDetailBiz.getUserInfoById(parentId);
+        if (appUserVo==null){
+            log.info("----userId==="+userId+"----parentId===="+parentId+"----该上线用户不存在");
+            return;
+        }
         AppUserRelation relation=getMyBiz().getRelationByUserId(parentId);
         Long time=System.currentTimeMillis();
          if(relation==null){
@@ -122,7 +132,6 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
         }
 
     }
-
     /**
      * 小程序分享上下线绑定
      * @param userid  当前人小程序id
@@ -218,9 +227,10 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
 
     //获取用户的下线总数
     public  int getCountByParentId(Integer parentId,Long time){
-        Example example=new Example(AppUserRelation.class);
-        example.createCriteria().andEqualTo("parentId",parentId).andNotEqualTo("isForever",1).andGreaterThan("bindTime",time);
-        return  mapper.selectCountByExample(example);
+         if (validTime<=0){
+             time= validTime;
+         }
+        return  mapper.countByParentId(parentId,time);
     }
 
      @CacheClear(key="user:relation{1.userId}")

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserRelationMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -16,4 +17,7 @@ public interface AppUserRelationMapper extends Mapper<AppUserRelation> {
 
 
     List<AppUserRelation> selectByLeaderId(Integer leaderId);
+
+    //获取有效的下级
+    public  int countByParentId(@Param("parentId")Integer parentId,@Param("bindTime")Long bindTime);
 }

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

 package com.github.wxiaoqi.security.admin.rest;
 
-import com.ace.cache.annotation.Cache;
 import com.github.wxiaoqi.security.admin.biz.*;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.admin.vo.AppUserGroups;
 import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
@@ -14,24 +12,20 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
-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.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.feign.OrderFeign;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
 import java.util.List;
 import java.util.Map;
 
@@ -153,7 +147,7 @@ public class AppUserController extends CommonBaseController{
             UserMemberVo memberVo=userMemberBiz.getMemberInfoByUserId(userid);
             if(memberVo!=null){
                 BeanUtils.copyProperties(userDTO,memberVo);
-                userDTO.setPayCount(orderFeign.baseOrderCount(SYS_TRUE, "4,5,6,7", null, userid).getData());
+                userDTO.setPayCount(orderFeign.baseOrderCount(SYS_TRUE, "4,5,6,-1", null, userid).getData());
                 Integer level=memberVo.getMemberLevel();
                 BaseUserMemberLevel memberLevel=userMemberLevelBiz.getLevel(level);
                 if (memberLevel!=null){
@@ -285,4 +279,11 @@ public class AppUserController extends CommonBaseController{
          AppUserInfoVo appUserInfoVo = userDetailBiz.findUserInfoByCode(code);
          return ObjectRestResponse.succ(appUserInfoVo);
     }
+
+    @GetMapping("/app/unauth/test")
+    @IgnoreUserToken
+    @IgnoreClientToken
+    public Object test() {
+        return appUserLoginBiz.test();
+    }
 }

ace-modules/ace-admin/src/main/resources/mapper/AppUserRelationMapper.xml

@@ -6,4 +6,12 @@
     <select id="selectByLeaderId" resultType="com.github.wxiaoqi.security.admin.entity.AppUserRelation">
         select `parent_id` as `parentId`,`user_id`as `userId`,`bind_time` as `bindTime` from `app_user_relation` where `parent_id`=#{leaderId} and `is_del`=0 order by `bind_time` DESC
     </select>
+
+    <select id="countByParentId" resultType="Integer">
+        select count(*)  from `app_user_relation` where
+        `parent_id`=#{parentId} and `is_del`=0
+         <if test="bindTime!='' and bindTime!=null and bindTime>0">
+             and (is_forever=1 or bind_time>#{bindTime})
+         </if>
+    </select>
 </mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/IntegralUserRecordBiz.java

@@ -181,7 +181,7 @@ public class IntegralUserRecordBiz extends BaseBiz<IntegralUserRecordMapper, Int
         } else {
             integralUserRecordDto.setStartTime(null);
             Integer count = mapper.countByUserAndCode(integralUserRecordDto);
-            integralUserStatus.setIntegralStatus(count == number);
+            integralUserStatus.setIntegralStatus(true);
         }
         integralUserStatusBiz.save(integralUserStatus);
     }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/IntegralUserRecordController.java

@@ -38,4 +38,6 @@ public class IntegralUserRecordController {
     public ObjectRestResponse getListByCode(IntegralUserRecordDto integralUserRecordDto) {
         return integralUserRecordBiz.getByUserAndTime(integralUserRecordDto);
     }
+
+
 }

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/vo/BannerVo.java

@@ -11,7 +11,8 @@ import lombok.Data;
 @Data
 public class BannerVo {
 
-    private  String title;
+    private Long id;
+    private String title;
 
     /**
      * 封面地址

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BannerBiz.java

@@ -40,6 +40,7 @@ public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
             bannerVo.setCover(banner.getCover());
             bannerVo.setUrl(banner.getUrl());
             bannerVo.setTitle(banner.getTitle());
+            bannerVo.setId(banner.getId());
             bannerVos.add(bannerVo);
         });
         return bannerVos;

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/CofigBiz.java

@@ -77,7 +77,7 @@ public class CofigBiz extends BaseBiz<CofigMapper, Cofig> {
         Example example = new Example(Cofig.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("isDel", 0);
-
+        example.setOrderByClause("type");
         PageDataVO<Cofig> cofigPage = PageDataVO.pageInfo(query.getPage(), query.getLimit(), () -> mapper.selectByExample(example));
 
         return new TableResultResponse<>(cofigPage.getTotalCount(), cofigPage.getData());

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopDetailDTO.java

@@ -73,4 +73,7 @@ public class CampsiteShopDetailDTO {
      */
     private String logo;
 
+    @ApiModelProperty(value = "海报背景")
+    private String posterBackground;
+
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopAdminVO.java

@@ -170,4 +170,6 @@ public class CampsiteShopAdminVO {
      */
     private List<CampsiteTagListVo>  campsiteTagListVos;
 
+    @ApiModelProperty(value = "海报背景")
+    private String posterBackground;
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopDetailVo.java

@@ -97,4 +97,7 @@ public class CampsiteShopDetailVo {
      * 店铺logo
      */
     private  String logo;
+
+    @ApiModelProperty(value = "海报背景")
+    private String posterBackground;
 }

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -58,7 +58,7 @@
 
     <!--根据id查询详情-->
     <select id="findCampsiteShopDetailById" resultType="com.xxfc.platform.campsite.dto.CampsiteShopDetailDTO">
-        select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,`service_phone` as `phone`,`logo` as `logo`,
+        select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,`service_phone` as `phone`,`logo` as `logo`,`poster_background` as `posterBackground` ,
         `content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude` from `campsite_shop` where `id`=#{id}
     </select>
 

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

@@ -8,8 +8,10 @@ import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+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.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.activity.feign.ActivityFeign;
@@ -22,6 +24,8 @@ import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
+import com.xxfc.platform.order.pojo.order.QueryOrderDTO;
+import com.xxfc.platform.order.rest.BaseOrderController;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.dto.SendMsgDTO;
@@ -34,6 +38,8 @@ 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;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +47,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
@@ -133,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());
 
@@ -153,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();
@@ -169,7 +189,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 ids.add(Integer.parseInt(orderPageVo.getOrderTourDetail().getTourUserIds()));
             }
             List<AppUserVo> list = userFeign.getByUserIds(ids).getData();
-            orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? null : list);
+            orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? new ArrayList<>() : list);
         }
         //设置保留金
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
@@ -259,7 +279,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 ids.add(Integer.parseInt(orderPageVo.getOrderTourDetail().getTourUserIds()));
             }
             List<AppUserVo> list = userFeign.getByUserIds(ids).getData();
-            orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? null : list);
+            orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? new ArrayList<>() : list);
         }
         //设置保留金
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
@@ -322,6 +342,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                     setOrderId(baseOrder.getId());
                 }});
                 //车辆预定审核通过
+                RestResponse<Integer> result = vehicleFeign.rentProveVehicleBooking(orvd.getBookRecordId());
 
                 //确认免费天数
                 if (orvd.getFreeDays() > 0) {
@@ -461,5 +482,21 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         }
     }
 
+    public Query initQuery(String no) {
+        QueryOrderDetailDTO qodd = new QueryOrderDetailDTO();
+        qodd.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
+        qodd.setNo(no);
+        qodd.setLimit(1);
+        qodd.setPage(1);
+        Query query = new Query(qodd);
+        return query;
+    }
 
+    /**
+     * 订单查询类
+     */
+    @Data
+    public static class QueryOrderDetailDTO extends QueryOrderDTO {
+        private String no;
+    }
 }
\ No newline at end of file

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

 package com.xxfc.platform.order.biz;
 
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
-import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.DailyMembersOrderStatisticsMapper;
-import com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import tk.mybatis.mapper.entity.Example;
 
-import java.math.BigDecimal;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -38,13 +37,25 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
     public boolean memberOrderStatistics() {
         try {
 
-            List<Map<String, Object>> travelGmv = mapper.getTravelGmv(day);
-            if (CollectionUtils.isEmpty(travelGmv)) {
+            Map<String, Object> travelGmv = mapper.getTravelGmv(day);
+            if (travelGmv.isEmpty()) {
                 return true;
             }
-            for (Map<String, Object> stringObjectMap : travelGmv) {
-                DailyMembersOrderStatistics MembersStatistics = new DailyMembersOrderStatistics();
-                BeanUtils.copyProperties(MembersStatistics, stringObjectMap);
+
+
+            DailyMembersOrderStatistics MembersStatistics = new DailyMembersOrderStatistics();
+            BeanUtils.copyProperties(MembersStatistics, travelGmv);
+
+            String oneDay = MembersStatistics.getOneDay();
+
+            if (StringUtils.isBlank(oneDay)) {
+                throw new BaseException();
+            }
+
+            Example exa = new Example(DailyMembersOrderStatistics.class);
+            exa.createCriteria().andEqualTo("oneDay", oneDay);
+            List<DailyMembersOrderStatistics> statistics = selectByExample(exa);
+            if (CollectionUtils.isEmpty(statistics)) {
                 insertSelective(MembersStatistics);
             }
             return true;

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

@@ -3,16 +3,21 @@ package com.xxfc.platform.order.biz;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import tk.mybatis.mapper.entity.Example;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 每日旅游订单统计
@@ -20,6 +25,7 @@ import java.util.*;
  * @author Administrator
  */
 @Service
+@Slf4j
 public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStatisticsMapper, DailyTravelOrderStatistics> {
     @Value("${order.day}")
     private Integer day;
@@ -58,10 +64,26 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
                 BeanUtil.copyProperties(object, statistics, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
 
             }
+            String oneDay = map.entrySet().parallelStream().map(Map.Entry::getValue).collect(Collectors.toList()).get(0).getOneDay();
 
-            for (Map.Entry<Integer, DailyTravelOrderStatistics> e : map.entrySet()) {
-                insertSelectiveRe(e.getValue());
+            if (StringUtils.isBlank(oneDay)) {
+                throw new BaseException();
             }
+            Example exa= new Example(DailyTravelOrderStatistics.class);
+            exa.createCriteria().andEqualTo("oneDay",oneDay);
+            List<DailyTravelOrderStatistics> statistics= selectByExample(exa);
+            if (CollectionUtils.isEmpty(statistics)){
+                for (Map.Entry<Integer, DailyTravelOrderStatistics> entry : map.entrySet()) {
+                    insertSelectiveRe(entry.getValue());
+                }
+            }else {
+                log.error("今日已统计车辆订单,请不要重复统计!");
+            }
+
+//
+//            for (Map.Entry<Integer, DailyTravelOrderStatistics> e : map.entrySet()) {
+//                insertSelectiveRe(e.getValue());
+//            }
         }
     }
 

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

@@ -4,19 +4,27 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.alibaba.fastjson.JSON;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.xxfc.platform.order.entity.DailyOrderStatistics;
 import com.xxfc.platform.order.entity.DailyVehicleOrderStatistics;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.DailyVehicleOrderStatisticsMapper;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import sun.rmi.runtime.Log;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
+import javax.print.attribute.standard.MediaSize;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 每日租车订单统计
@@ -24,6 +32,7 @@ import java.util.*;
  * @author Administrator
  */
 @Service
+@Slf4j
 public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderStatisticsMapper, DailyVehicleOrderStatistics> {
 
     private final Integer TYPE_DEFERRED = 1;
@@ -73,8 +82,8 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
     }
 
     private void InsertByList(ArrayList<DailyVehicleOrderStatistics> result) throws Exception {
+        if (CollectionUtils.isNotEmpty(result)) {
 
-        if(CollectionUtils.isNotEmpty(result)) {
             Map<Integer, DailyVehicleOrderStatistics> map = new HashMap<>();
 
             for (DailyVehicleOrderStatistics value : result) {
@@ -89,11 +98,22 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
                         value,
                         statistics,
                         CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+            }
 
+            String oneDay = map.entrySet().parallelStream().map(Map.Entry::getValue).collect(Collectors.toList()).get(0).getOneDay();
+            if (StringUtils.isBlank(oneDay)) {
+                throw new BaseException();
             }
+            Example  exa= new Example(DailyVehicleOrderStatistics.class);
+            exa.createCriteria().andEqualTo("oneDay",oneDay);
+            List<DailyVehicleOrderStatistics> statistics= selectByExample(exa);
 
-            for (Map.Entry<Integer, DailyVehicleOrderStatistics> entry : map.entrySet()) {
-                insertSelectiveRe(entry.getValue());
+            if (CollectionUtils.isEmpty(statistics)){
+                for (Map.Entry<Integer, DailyVehicleOrderStatistics> entry : map.entrySet()) {
+                    insertSelectiveRe(entry.getValue());
+                }
+            }else {
+                log.error("今日已统计车辆订单,请不要重复统计!");
             }
         }
 

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

@@ -127,28 +127,6 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
             orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), depositRefundRecordStatus);
             orderMsgBiz.handelMsgDeposit(orderMQDTO.getOrderRentVehicleDetail(), orderMQDTO, userFeign.userDetailById(orderMQDTO.getUserId()).getData());
         }
-//        else {
-//            //还车扣除款 剩余的 钱，再减去违章预备金
-//            BigDecimal originalRefundAmount = orderMQDTO.getOrderRentVehicleDetail().getReturnPayResidue();
-//            BigDecimal refundAmont = originalRefundAmount;
-//            String refundDesc = "退还剩余违章保证金："+ refundAmont.toString();
-//
-//            //已退还部分， 进行剩余的保留违章预备金 的退还
-//                //获取违章记录
-//            List<OrderViolation> orderViolations = orderViolationBiz.selectList(new OrderViolation(){{
-//                setDetailId(orderMQDTO.getOrderRentVehicleDetail().getId());
-//            }});
-//
-//            if(orderViolations.size() > 0) {
-//                refundDesc += "(已扣除 违章金额："+ illegalReserve.toString();
-//                for(OrderViolation ov : orderViolations) {
-//                    refundDesc += ", "+ ov.getPrice();
-//                    refundAmont = refundAmont.subtract(ov.getPrice());
-//                }
-//                refundDesc += ")";
-//                refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
-//            }
-//        }
     }
 
     public void refundTrigger(BaseOrder baseOrder, OrderRentVehicleDetail orvd, BigDecimal residueAmount, BigDecimal originalRefundAmount, BigDecimal refundAmont, String refundDesc, Integer refundStatus, RefundTypeEnum refundTypeEnum) {
@@ -162,46 +140,52 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
     }
 
     /**
-     * 租车退款流程(不含押金的通用方法)
+     * 租车（包括旅游）退款流程
      * @param baseOrder
-     * @param startTime
-     * @param dicParentKey
-     */
-    public void rentRefundProcess(BaseOrder baseOrder, Long startTime, String dicParentKey){
-        rentRefundProcess(baseOrder, BigDecimal.ZERO, startTime, dicParentKey);
-    }
-
-    /**
-     * 租车（包括旅游）退款流程(含押金)
-     * @param baseOrder
-     * @param depositAmount
      * @param timeLag 与开始时间的时间差
      * @param dicParentKey
      */
-    public void rentRefundProcess(BaseOrder baseOrder, BigDecimal depositAmount, Long timeLag, String dicParentKey) {
+    public void rentRefundProcess(BaseOrder baseOrder, Long timeLag, String dicParentKey) {
         //计算退款金额
-        // 1、押金 + 租金(规则扣除)
+            //商品价格 - 优惠券减免的价格
         BigDecimal originalRefundAmount = BigDecimal.ZERO.add(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()));
         StringBuilder refundDescBuilder = new StringBuilder("取消订单退款:");
-        if(null == depositAmount) {
-            depositAmount = BigDecimal.ZERO;
-        }else {
-            //触发押金退款
-            refundSubProcess(baseOrder, refundDescBuilder.toString(), depositAmount, depositAmount, RefundTypeEnum.DEPOSIT.getCode(), RefundStatusEnum.ALL.getCode());
-        }
-        //商品价格 - 优惠券减免的价格
         BigDecimal refundGoodsAmount = calculateRefund(originalRefundAmount, timeLag, dicParentKey, refundDescBuilder);
         refundGoodsAmount = refundGoodsAmount.setScale(2, RoundingMode.HALF_UP);
 
         //退款金额
-//        BigDecimal refundAmount = depositAmount.add(refundGoodsAmount);
-//        originalRefundAmount = depositAmount.add(originalRefundAmount);
         BigDecimal refundAmount = refundGoodsAmount;
 
         //退款子流程: 订单基础，退款描述，退款金额
         refundSubProcess(baseOrder, refundDescBuilder.toString(), originalRefundAmount, refundAmount, RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode());
     }
 
+    /**
+     * 租车押金退款流程
+     * @param baseOrder
+     * @param depositAmount
+     * @param timeLag 与开始时间的时间差
+     * @param dicParentKey
+     * @param originalDeductAmount
+     */
+    public void rentRefundDepositProcess(BaseOrder baseOrder, BigDecimal depositAmount, Long timeLag, String dicParentKey, BigDecimal originalDeductAmount) {
+        // 1、押金 + 租金(规则扣除)
+        BigDecimal originalRefundAmount = BigDecimal.ZERO.add(depositAmount);
+        BigDecimal refundAmount = BigDecimal.ZERO.add(depositAmount);
+        StringBuilder refundDescBuilder = new StringBuilder("取消订单押金退款:");
+        if(null != originalDeductAmount && BigDecimal.ZERO.compareTo(originalDeductAmount) < 0) {
+            //通过原扣除款 计算剩余款
+            BigDecimal residueAmount = calculateRefund(originalDeductAmount, timeLag, dicParentKey, refundDescBuilder);
+            residueAmount = residueAmount.setScale(2, RoundingMode.HALF_UP);
+
+            //退款金额 ：押金 - (原扣除款 - 剩余款)
+            refundAmount = originalRefundAmount.subtract(originalDeductAmount.subtract(residueAmount));
+        }
+
+        //触发押金退款
+        refundSubProcess(baseOrder, refundDescBuilder.toString(), originalRefundAmount, refundAmount, RefundTypeEnum.DEPOSIT.getCode(), RefundStatusEnum.ALL.getCode());
+    }
+
     public BigDecimal calculateRefund(BigDecimal goodsAmount, Long timeLag, String dicParentKey, StringBuilder refundDescBuilder) {
         BigDecimal refundGoodsAmount = goodsAmount;
 

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

 package com.xxfc.platform.order.biz.inner;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.exception.BaseException;
-import com.github.wxiaoqi.security.common.util.IntervalUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.order.biz.*;
-import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
-import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.tour.feign.TourFeign;
-import com.xxfc.platform.universal.dto.SmsTemplateDTO;
-import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
-import com.xxfc.platform.universal.vo.OrderRefundVo;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.jexl2.MapContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,7 +20,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.*;
 
-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.universal.constant.DictionaryKey.*;
 
@@ -49,6 +37,9 @@ public class OrderCancelBiz {
     @Autowired
     BaseOrderBiz baseOrderBiz;
 
+    @Autowired
+    OrderItemBiz orderItemBiz;
+
     @Autowired
     OrderMemberDetailBiz orderMemberDetailBiz;
 
@@ -119,18 +110,34 @@ public class OrderCancelBiz {
                         setOrderId(baseOrder.getId());
                     }});
 
+                    //原退还押金
+                    BigDecimal freeDayAmount = BigDecimal.ZERO;
+                    //判断是否使用免费天数，并且进行扣款
+                    if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
+                        OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
+                            setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+                            setOrderId(baseOrder.getId());
+                        }});
+                        freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
+                    }
+
+
                     //如果超过出发时间，不能取消订单
                     //根据时间处理goodsAmount
                     //获取出发时间 到现在 距离时间
                     Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
-                    if(timeLag < 0) {
-                        throw new BaseException(ResultCode.FAILED_CODE, new HashSet<String>(){{
-                            add("已超过出发时间，不能取消订单");
-                        }});
-                    }
+                    //后面允许开始时间过后可以取消订单
+//                    if(timeLag < 0) {
+//                        throw new BaseException(ResultCode.FAILED_CODE, new HashSet<String>(){{
+//                            add("已超过出发时间，不能取消订单");
+//                        }});
+//                    }
 
                     //退款流程
-                    orderRefundBiz.rentRefundProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND);
+                        //退押金
+                    orderRefundBiz.rentRefundDepositProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, freeDayAmount);
+                        //退订单款
+                    orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ RENT_REFUND);
 
                     //已付款的取消订单发送消息
                     try {
@@ -166,8 +173,8 @@ public class OrderCancelBiz {
 
                 //取消租车预定
                 //已支付,并且是待出行状态，取消预约
-                if(OrderStatusEnum.ORDER_TOSTART.equals(baseOrder.getType()) && SYS_TRUE.equals(baseOrder.getHasPay())){
-                    vehicleFeign.unbookVehicle(orvd.getBookRecordId());
+                if(OrderStatusEnum.ORDER_TOSTART.getCode().equals(baseOrder.getStatus()) && SYS_TRUE.equals(baseOrder.getHasPay())){
+                    vehicleFeign.rentUnbookVehicle(orvd.getBookRecordId());
                 }else {
                     //未支付，拒绝之前的预约
                     RestResponse<Integer> restResponse = vehicleFeign.rentRejectVehicleBooking(orvd.getBookRecordId());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java

@@ -71,74 +71,61 @@ public class RentDepositJobHandler extends IJobHandler {
     UserFeign userFeign;
 
     @Override
-    public ReturnT<String> execute(String idLastNumInterval) throws Exception {
+    public ReturnT<String> execute(String idLastNumInterval) {
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
         Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
 
         try {
-//            for(int i = 0; i < 10; i++) {
-//                if(IntervalUtil.staticIsInTheInterval(String.valueOf(i), idLastNumInterval)) {
-                    //三十天
-                    List<BaseOrder> lists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
-                            //订单已完成的租车订单
-                            .where(WeekendSqls.<BaseOrder>custom().andEqualTo(BaseOrder::getType, OrderTypeEnum.RENT_VEHICLE.getCode())
-                                    .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_FINISH.getCode()) //已完成的订单
-                                    .andEqualTo(BaseOrder::getRefundStatus, RefundStatusEnum.RESIDUE_ILLEGAL.getCode()) //已归还了部分押金
-                                    .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.date(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)))
+            List<BaseOrder> lists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
+                //订单已完成的租车订单
+                .where(WeekendSqls.<BaseOrder>custom().andEqualTo(BaseOrder::getType, OrderTypeEnum.RENT_VEHICLE.getCode())
+                        .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_FINISH.getCode()) //已完成的订单
+                        .andEqualTo(BaseOrder::getRefundStatus, RefundStatusEnum.RESIDUE_ILLEGAL.getCode()) //已归还了部分押金
+                        .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.date(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)))
 //                                    .andLike(BaseOrder::getId, "%"+ i)
-                            ).build());
-
-                    //处理自动退剩余押金
-                    for(BaseOrder baseOrder : lists) {
-                        OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail() {{
-                            setOrderId(baseOrder.getId());
-                        }});
-
-                        Integer crosstownTypeEnum;
-                        //判断是否定损过
-                        if(SYS_TRUE.equals(orvd.getFixedLossStatus())) {
-                            crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
-                        }else {
-                            crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
-                        }
-                        OrderVehicleCrosstown crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
-                            setOrderId(baseOrder.getId());
-                            setType(crosstownTypeEnum);
-                        }});
-
-                        if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)) < 0) {
-                            OrderViolation orderViolation = orderViolationBiz.selectOne(new OrderViolation(){{
-                                setDetailId(orvd.getId());
-                                setIsDel(SYS_FALSE);
-                            }});
-
-                            String refundDesc = "退还押金：";
-                            BigDecimal refundAmont;
-                            if(null != orderViolation) {
-                                //还车扣除款 剩余的 钱，再减去违章预备金
-                                refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
-                                refundDesc += refundAmont.toString()+ "(已扣除 违章扣款："+ refundAmont.toString();
-                                refundDesc += ")";
-                            }else {
-                                refundAmont = orvd.getReturnPayResidue();
-                                refundDesc += refundAmont.toString();
-                            }
-                            orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
-                            orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), DepositRefundStatus.VIOLATIONARRIVAL);
-                            orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
-                        }
-
-                        //获取交车时间
-//                        List<OrderVehicleCrosstown> crosstowns = crosstownBiz.selectByExample(
-//                                new Example.Builder(BaseOrder.class)
-//                                        .where(WeekendSqls.<OrderVehicleCrosstown>custom()
-//                                                .andIn(OrderVehicleCrosstown::getType, Lists.newArrayList(CrosstownTypeEnum.ARRIVE.getCode(), CrosstownTypeEnum.FIXED_LOSS.getCode()))
-//                                                .andEqualTo(OrderVehicleCrosstown::getOrderId, baseOrder.getId())).build());
-
+                ).build());
+
+            //处理自动退剩余押金
+            for(BaseOrder baseOrder : lists) {
+                OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail() {{
+                    setOrderId(baseOrder.getId());
+                }});
+
+                Integer crosstownTypeEnum;
+                //判断是否定损过
+                if(SYS_TRUE.equals(orvd.getFixedLossStatus())) {
+                    crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
+                }else {
+                    crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
+                }
+                OrderVehicleCrosstown crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
+                    setOrderId(baseOrder.getId());
+                    setType(crosstownTypeEnum);
+                }});
+
+                if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)) < 0) {
+                    OrderViolation orderViolation = orderViolationBiz.selectOne(new OrderViolation(){{
+                        setDetailId(orvd.getId());
+                        setIsDel(SYS_FALSE);
+                    }});
+
+                    String refundDesc = "退还押金：";
+                    BigDecimal refundAmont;
+                    if(null != orderViolation) {
+                        //还车扣除款 剩余的 钱，再减去违章预备金
+                        refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
+                        refundDesc += refundAmont.toString()+ "(已扣除 违章扣款："+ refundAmont.toString();
+                        refundDesc += ")";
+                    }else {
+                        refundAmont = orvd.getReturnPayResidue();
+                        refundDesc += refundAmont.toString();
                     }
+                    orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
+                    orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), DepositRefundStatus.VIOLATIONARRIVAL);
+                    orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
+                }
 
-//                }
-//            }
+            }
             ReturnT returnT = new ReturnT();
             returnT.setCode(100);
             returnT.setMsg("成功");

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/DailyMembersOrderStatisticsMapper.java

@@ -14,7 +14,7 @@ import java.util.Map;
  */
 public interface DailyMembersOrderStatisticsMapper extends Mapper<DailyMembersOrderStatistics> {
 
-    List<Map<String, Object>> getTravelGmv(@Param("day") Integer day);
+    Map<String, Object> getTravelGmv(@Param("day") Integer day);
 
     OrderStatistics monthOrderTotal(@Param("companyId") Integer companyId);
 

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

 package com.xxfc.platform.order.rest;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
@@ -14,16 +16,22 @@ import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
+import com.xxfc.platform.order.biz.OrderItemBiz;
+import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.biz.OrderUserLicenseBiz;
-import com.xxfc.platform.order.pojo.order.OrderListVo;
-import com.xxfc.platform.order.pojo.order.OrderPageVO;
-import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
-import com.xxfc.platform.order.pojo.order.QueryOrderDTO;
+import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
+import com.xxfc.platform.order.entity.OrderItem;
+import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
+import com.xxfc.platform.order.pojo.order.*;
+import com.xxfc.platform.order.service.OrderRentVehicleService;
 import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 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.BookVehicleVO;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.QueryMultiDTO;
 import io.swagger.annotations.Api;
@@ -31,14 +39,20 @@ import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.mockito.internal.util.collections.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.xxfc.platform.order.pojo.AddRentVehicleDTO.DEFAULT_DATE_TIME_FORMATTER;
+
 @Controller
 @RequestMapping("baseOrder")
 @Api(value = "订单后台相关", tags = {"订单后台相关"})
@@ -49,9 +63,18 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @Autowired
     BaseOrderBiz baseOrderBiz;
 
+    @Autowired
+    OrderRentVehicleBiz orderRentVehicleBiz;
+
     @Autowired
     OrderUserLicenseBiz orderUserLicenseBiz;
 
+    @Autowired
+    OrderRentVehicleService orderRentVehicleService;
+
+    @Autowired
+    OrderItemBiz orderItemBiz;
+
     @Autowired
     UserFeign userFeign;
 
@@ -199,6 +222,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 companyIds.add(dto.getStartCompanyId());
             }
         }
+        dto.setCompanyIds(companyIds);
         Query query = new Query(dto);
         PageDataVO<OrderPageVO> pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.getRentVehicle(query.getSuper()));
         for (OrderPageVO orderPageVO : pageDataVO.getData()) {
@@ -264,6 +288,53 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return new ObjectRestResponse<>().data(page.getData().get(0));
     }
 
+    @ApiOperation("更換車輛")
+    @RequestMapping(value = "/bg/change-vehicle", method = RequestMethod.POST)
+    @IgnoreClientToken
+    @ResponseBody
+    public ObjectRestResponse<OrderPageVO> changeVehicle(@RequestBody ChangeVehicleDTO dto) {
+        checkAdminUser();
+        //根据订单号获取订单
+        //查询列表数据
+        Query query = baseOrderBiz.initQuery(dto.getNo());
+        query.put("crtUser", null);
+        PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
+        OrderPageVO orderPageVO = page.getData().get(0);
+        if(null == orderPageVO) {
+            throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("订单不存在"));
+        }
+            //预约新的车辆
+        RentVehicleBO bo = BeanUtil.toBean(orderPageVO.getOrderRentVehicleDetail(), RentVehicleBO.class);
+        bo.setOrder(orderPageVO);
+        bo.setBookVehicleVO(new BookVehicleVO(){{
+            setBookStartDate(DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getStartTime()), ZoneOffset.ofHours(8))));
+            setBookEndDate(DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getEndTime()), ZoneOffset.ofHours(8))));
+        }});
+
+        List<OrderAccompanyDTO> oads = JSONUtil.toList(JSONUtil.parseArray(orderItemBiz.selectOne(new OrderItem(){{
+            setOrderId(orderPageVO.getId());
+            setType(ItemTypeEnum.ACCOMPANY.getCode());
+        }}).getDetail()), OrderAccompanyDTO.class);
+        bo.setAccompanyItems(oads);
+        Long oldBookRecordId = bo.getBookRecordId();
+        orderRentVehicleService.acquireVehicle(bo, dto.getNumberPlate(), VehicleBookRecordStatus.APPROVE.getCode());
+        //如果成功则取消旧车的预约
+        RestResponse<Integer> rentUnbookResponse = vehicleFeign.rentUnbookVehicle(oldBookRecordId);
+        //设置新的vehicleId 和 record
+        orderRentVehicleBiz.updateSelectiveByIdRe(new OrderRentVehicleDetail(){{
+            setId(bo.getId());
+            setVehicleId(bo.getVehicleId());
+            setBookRecordId(bo.getBookRecordId());
+        }});
+        return ObjectRestResponse.succ();
+    }
+
+    @Data
+    public static class ChangeVehicleDTO {
+        String no;
+        String numberPlate;
+    }
+
     private Query initCompanyQuery(String no) {
         BackStageOrderController.QueryOrderDetailDTO qodd = new BackStageOrderController.QueryOrderDetailDTO();
         //查询公司id

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

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -55,7 +54,6 @@ import tk.mybatis.mapper.weekend.WeekendSqls;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -87,9 +85,6 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @Autowired
     UserFeign userFeign;
 
-    @Resource
-    VehicleFeign vehicleFeign;
-
     @Autowired
     RabbitProduct rabbitProduct;
 
@@ -198,7 +193,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         checkAppUser();
 
         //查询列表数据
-        Query query = initQuery(no);
+        Query query = baseOrderBiz.initQuery(no);
         PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
         if (page.getData().isEmpty()) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
@@ -212,16 +207,6 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         return new ObjectRestResponse<>().data(page.getData().get(0));
     }
 
-    private Query initQuery(String no) {
-        QueryOrderDetailDTO qodd = new QueryOrderDetailDTO();
-        qodd.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
-        qodd.setNo(no);
-        qodd.setLimit(1);
-        qodd.setPage(1);
-        Query query = new Query(qodd);
-        return query;
-    }
-
     @RequestMapping(value = "/pay", method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "订单支付")
@@ -307,16 +292,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         return null;
     }
 
-    /**
-     * 订单查询类
-     */
-    @Data
-    public class QueryOrderDetailDTO extends QueryOrderDTO {
-        private String no;
-    }
-
     @Data
-    public class QueryOrderList extends QueryOrderDetailDTO {
+    public class QueryOrderList extends BaseOrderBiz.QueryOrderDetailDTO {
 
         private Long startTime;
 

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

@@ -8,10 +8,14 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
+import com.xxfc.platform.order.biz.OrderItemBiz;
 import com.xxfc.platform.order.biz.OrderRefundBiz;
 import com.xxfc.platform.order.biz.inner.OrderCancelBiz;
+import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.entity.OrderItem;
 import com.xxfc.platform.order.entity.OrderRefund;
+import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import lombok.Data;
@@ -23,11 +27,11 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 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.universal.constant.DictionaryKey.TOUR_IN_REFUND;
-import static com.xxfc.platform.universal.constant.DictionaryKey.TOUR_REFUND;
+import static com.xxfc.platform.universal.constant.DictionaryKey.*;
 
 @Controller
 @RequestMapping("orderRefund")
@@ -39,6 +43,9 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
     @Autowired
     OrderRefundBiz orderRefundBiz;
 
+    @Autowired
+    OrderItemBiz orderItemBiz;
+
     @Autowired
     UserFeign userFeign;
 
@@ -67,8 +74,29 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
             case RENT_VEHICLE:
                 orderRefundAmount = orderRefundBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
                         , orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis()
-                        , DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.RENT_REFUND
+                        , DictionaryKey.APP_ORDER+ "_"+ RENT_REFUND
                         , refundDescBuilder);
+                OrderRentVehicleDetail orvd = orderPageVO.getOrderRentVehicleDetail();
+                Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
+                //原退还押金
+                BigDecimal originalDeductAmount = BigDecimal.ZERO;
+                BigDecimal originalRefundAmount = BigDecimal.ZERO.add(orvd.getDeposit());
+                //判断是否使用免费天数，并且进行扣款
+                if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
+                    refundDescBuilder = new StringBuilder("");
+                    OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
+                        setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+                        setOrderId(orderPageVO.getId());
+                    }});
+                    originalDeductAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
+                }
+                BigDecimal residueAmount = orderRefundBiz.calculateRefund(originalDeductAmount, timeLag, APP_ORDER+ "_"+ RENT_REFUND, refundDescBuilder);
+                residueAmount = residueAmount.setScale(2, RoundingMode.HALF_UP);
+
+                //押金剩余款 ：押金 - (原扣除款 - 剩余款)
+                //退款金额 ：订单剩余款 + 押金剩余款
+                orderRefundAmount = orderRefundAmount.add(originalRefundAmount.subtract(originalDeductAmount.subtract(residueAmount)));
+
                 break;
             case TOUR:
                 //判断是省内还是省外

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

@@ -35,22 +35,22 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
     /**
      * 租车订单
      */
-    private final Integer TYEP_VEHICLE = 1;
+    private final Integer TYPE_VEHICLE = 1;
 
     /**
-     * 旅游订单
+     * 旅游订单 
      */
-    private final Integer TYEP_TOUR = 2;
+    private final Integer TYPE_TOUR = 2;
 
     /**
      * 购买会员订单
      */
-    private final Integer TYEP_MEMBER = 3;
+    private final Integer TYPE_MEMBER = 3;
 
     /**
      * 月总数据
      */
-    private final Integer TYEP_TOTAL = 4;
+    private final Integer TYPE_TOTAL = 4;
 
     @Autowired
     private DailyVehicleOrderStatisticsBiz vehicleBiz;
@@ -77,22 +77,23 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
             UserDTO user = userDTOObjectRestResponse.getData();
 
             Integer companyId = user.getCompanyId();
-            if (TYEP_VEHICLE.equals(type)) {
+            if (TYPE_VEHICLE.equals(type)) {
                 OrderStatistics vehicle = vehicleBiz.findAll(companyId);
                 return ObjectRestResponse.succ(vehicle);
             }
-            if (TYEP_TOUR.equals(type)) {
+            if (TYPE_TOUR.equals(type)) {
                 OrderStatistics tour = TravelBiz.findAll(companyId);
                 return ObjectRestResponse.succ(tour);
             }
-            if (TYEP_MEMBER.equals(type)) {
+            if (TYPE_MEMBER.equals(type)) {
                 OrderStatistics member = membersBiz.findAll(companyId);
                 return ObjectRestResponse.succ(member);
             }
 
-            if (TYEP_TOTAL.equals(type)) {
+            if (TYPE_TOTAL.equals(type)) {
                 return ObjectRestResponse.succ(baseBiz.getTotalOrder(companyId));
             }
+
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "参数错误!");
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -188,7 +188,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         bo.setAccompanyItems(oads);
 
         //获取可用车辆
-        acquireVehicle(bo);
+        acquireVehicle(bo, null, null);
 
         OrderItem accompanyItem = orderItemBiz.initOrderItem(BigDecimal.ZERO, 1, "随车物品", null, ACCOMPANY);
         accompanyItem.setRealAmount(BigDecimal.ZERO);
@@ -412,7 +412,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         vo.setCostDetail(result);
     }
 
-    private void acquireVehicle(RentVehicleBO detail) {
+    public void acquireVehicle(RentVehicleBO detail, String numberPlate, Integer status) {
         //根据车型、时间、距离，门店，预定车辆
         RentVehicleBookDTO rentVehicleBookDTO = BeanUtil.toBean(detail.getBookVehicleVO(), RentVehicleBookDTO.class);
         rentVehicleBookDTO.setModelId(detail.getModelId());
@@ -420,6 +420,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         rentVehicleBookDTO.setLiftCompany(detail.getStartCompanyId());
         rentVehicleBookDTO.setLiftAddr(detail.getStartAddr());
         rentVehicleBookDTO.setRetCompany(detail.getEndCompanyId());
+        rentVehicleBookDTO.setOrderNo(detail.getOrder().getNo());
+        rentVehicleBookDTO.setNumberPlate(numberPlate);
+        rentVehicleBookDTO.setStatus(status);
         if(null != detail.getAccompanyItems()) {
             rentVehicleBookDTO.setSelectedAccItem(detail.getAccompanyItems().parallelStream().collect(Collectors.toMap(OrderAccompanyDTO::getId, OrderAccompanyDTO::getNum)));
         }

xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.xml

@@ -16,13 +16,33 @@
     </select>
 
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
-        SELECT
+ SELECT
         IFNULL(sum(gmv),0) as totalGmv
         FROM
-        daily_members_order_statistics
+        (
+				SELECT
+				 ANY_VALUE(id) AS id ,
+				 ANY_VALUE(branch_company_id) AS branch_company_id,
+				 ANY_VALUE(one_day) AS one_day,
+				 ANY_VALUE(gmv) AS gmv,
+				 ANY_VALUE(crt_time) AS crt_time
+				 FROM
+				 daily_members_order_statistics
+				 GROUP BY
+				 one_day,branch_company_id
+		) m
         WHERE
         branch_company_id =#{companyId}
-        and
-        DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),interval 1 day),'%Y-%c')
     </select>
+<!--    <select id="updateByExampleSelective">-->
+<!--                SELECT-->
+<!--        IFNULL(sum(gmv),0) as totalGmv-->
+<!--        FROM-->
+<!--        daily_members_order_statistics-->
+<!--        WHERE-->
+<!--        branch_company_id =#{companyId}-->
+<!--        and-->
+<!--        DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),interval 1 day),'%Y-%c')-->
+
+<!--    </select>-->
 </mapper>
\ No newline at end of file

xx-order/xx-order-server/src/main/resources/mapper/DailyTravelOrderStatisticsMapper.xml

@@ -51,14 +51,35 @@
 
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
         SELECT
-
         IFNULL(sum(gmv),0) as totalGmv,
         IFNULL(sum(penal_sum) ,0) as totalPenalSum
         FROM
-        daily_travel_order_statistics
+        (
+				SELECT
+				ANY_VALUE(id) AS id,
+				ANY_VALUE(branch_company_id) AS branch_company_id,
+				ANY_VALUE(one_day) AS one_day,
+				ANY_VALUE(gmv) AS gmv,
+				ANY_VALUE(penal_sum) AS penal_sum,
+				ANY_VALUE(crt_time) AS crt_time
+				FROM
+				daily_travel_order_statistics
+				GROUP BY
+				one_day,branch_company_id
+		) o
         WHERE
-        branch_company_id =#{branchCompanyId}
-        AND
-        DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%c')
+        branch_company_id =#{companyId}
     </select>
+
+<!--    <select id="updateByExampleSelective">-->
+<!--        SELECT-->
+<!--        IFNULL(sum(gmv),0) as totalGmv,-->
+<!--        IFNULL(sum(penal_sum) ,0) as totalPenalSum-->
+<!--        FROM-->
+<!--        daily_travel_order_statistics-->
+<!--        WHERE-->
+<!--        branch_company_id =#{branchCompanyId}-->
+<!--        AND-->
+<!--        DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%c')-->
+<!--    </select>-->
 </mapper>
\ No newline at end of file

xx-order/xx-order-server/src/main/resources/mapper/DailyVehicleOrderStatisticsMapper.xml

@@ -139,19 +139,48 @@
 
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
         SELECT
-
         IFNULL(sum(gmv),0) as totalGmv,
-        IFNULL(sum(security_deposit),0) as totalSecurityDeposit,
+        (IFNULL(sum(security_deposit),0)-IFNULL(sum(refund_security_deposit) ,0)) as totalSecurityDeposit,
         IFNULL(sum(refund_security_deposit) ,0) as totalRefundSecurityDeposit,
         IFNULL(sum(compensation) ,0) as totalCompensation,
         IFNULL(sum(forfeit) ,0) as totalForfeit,
         IFNULL(sum(penal_sum) ,0) as totalPenalSum,
         IFNULL(sum(postpone) ,0) as totalPostpone
         FROM
+        (
+        SELECT
+        ANY_VALUE(id) as id,
+        one_day,
+        branch_company_id,
+        ANY_VALUE(gmv) AS gmv,
+        ANY_VALUE(security_deposit) AS security_deposit,
+        ANY_VALUE(refund_security_deposit) AS refund_security_deposit,
+        ANY_VALUE(forfeit) AS forfeit,ANY_VALUE(penal_sum) AS penal_sum,
+        ANY_VALUE(postpone) AS postpone,ANY_VALUE(crt_time) AS crt_time,
+        ANY_VALUE(compensation) AS compensation
+        FROM
         daily_vehicle_order_statistics
+         GROUP  BY
+         one_day,branch_company_id
+         )  a
         WHERE
-        branch_company_id =#{companyId}
-        and
-        DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),interval 1 day),'%Y-%c')
+        branch_company_id = #{companyId}
     </select>
+
+<!--    <select id="updateByExampleSelective">-->
+<!--                        SELECT-->
+<!--        IFNULL(sum(gmv),0) as totalGmv,-->
+<!--        (IFNULL(sum(security_deposit),0)-IFNULL(sum(refund_security_deposit) ,0)) as totalSecurityDeposit,-->
+<!--        IFNULL(sum(refund_security_deposit) ,0) as totalRefundSecurityDeposit,-->
+<!--        IFNULL(sum(compensation) ,0) as totalCompensation,-->
+<!--        IFNULL(sum(forfeit) ,0) as totalForfeit,-->
+<!--        IFNULL(sum(penal_sum) ,0) as totalPenalSum,-->
+<!--        IFNULL(sum(postpone) ,0) as totalPostpone-->
+<!--        FROM-->
+<!--        daily_vehicle_order_statistics-->
+<!--        WHERE-->
+<!--        branch_company_id =#{companyId}-->
+<!--        and-->
+<!--        DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),interval 1 day),'%Y-%c')-->
+<!--    </select>-->
 </mapper>
\ No newline at end of file

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/entity/IdInformation.java

@@ -47,7 +47,7 @@ public class IdInformation implements Serializable {
      * 用户id
      */
     @Column(name = "user_login_id")
-    private Integer  userLonginId;
+    private Integer  userLoginId;
 
     /**
      *

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/ThirdFeign.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.entity.IdInformation;
 import com.xxfc.platform.universal.vo.OrderPayVo;
 import com.xxfc.platform.universal.vo.OrderRefundVo;
 import com.xxfc.platform.universal.vo.TrafficViolations;
@@ -74,7 +75,8 @@ public interface ThirdFeign {
     @PostMapping("/dictionary/type_code")
     public  Dictionary findDictionaryByTypeAndCode(@RequestParam(value = "type") String type,@RequestParam(value = "code") String code);
 
-
+    @GetMapping(value = "/certif/app/unauth/selectByUser")
+    public IdInformation getOneByUserId(@RequestParam(value = "userId")Integer userId);
 
     /*****************************************  违章 ********************************************/
     @GetMapping("/3p/tv/getRentViolation")

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

@@ -24,7 +24,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.universal.mapper")
 @EnableFeignClients(value = {"com.xxfc.platform","com.github.wxiaoqi.security"},defaultConfiguration = HeaderConfig.class)
 public class UniversalApplication {
-
     public static void main(String[] args) {
         SpringApplication.run(UniversalApplication.class, args);
     }

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

@@ -12,14 +12,10 @@ import com.xxfc.platform.universal.biz.MQServiceBiZ;
 import com.xxfc.platform.universal.entity.IdInformation;
 import com.xxfc.platform.universal.service.CertificationService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.concurrent.CompletableFuture;
@@ -45,7 +41,6 @@ public class CertificationController   {
     private UserFeign userFeign;
 
     @Qualifier("applicationTaskExecutor")
-
     @Autowired
     private TaskExecutor executor;
 
@@ -79,11 +74,11 @@ public class CertificationController   {
             return ObjectRestResponse.createFailedResult(ResultCode.GET_APPUSER_FAILED_CODE,"无法识别,请重新上传");
         }
         AppUserDTO appUserDTO = appUserDTOObjectRestResponse.getData();
-        idInformation.setUserLonginId(appUserDTO.getUserid());
+        idInformation.setUserLoginId(appUserDTO.getUserid());
         //获取用户认证信息
         ObjectRestResponse orr = null;
         try {
-            orr = userFeign.authentication(idInformation.getUserLonginId(), null,null, 0);
+            orr = userFeign.authentication(idInformation.getUserLoginId(), null,null, 0);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -125,4 +120,8 @@ public class CertificationController   {
         mqServiceBiZ.sendMessage(RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
     }
 
+    @GetMapping(value = "/app/unauth/selectByUser")
+    public IdInformation getOneByUserId(Integer userId) {
+        return certificationService.getByUser(userId);
+    }
 }

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

@@ -14,10 +14,15 @@ public class MQSenderController {
     private MQServiceBiZ mqServiceBiZ;
 
     @GetMapping(value = "/sendMessage")
-    public ObjectRestResponse sendMessage(@RequestParam(value = "exchange") String exchange, @RequestParam(value = "routKey") String routKey, @RequestParam(value = "json") String json) {
+    public ObjectRestResponse sendMessage(String exchange, String routKey, String json) {
         return mqServiceBiZ.sendMessage(exchange, routKey, json);
     }
 
+    @PostMapping(value = "/app/unauth/sendMessage")
+    public ObjectRestResponse sendPostMessage(@RequestBody String json) {
+        return mqServiceBiZ.sendMessage("","", json);
+    }
+
     @PostMapping(value = "/sendMessage")
     @ResponseBody
     public ObjectRestResponse sendMessage(@RequestBody SendMsgDTO dto) {

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/mapper/IdInformationMapper.java

@@ -2,8 +2,6 @@ package com.xxfc.platform.universal.mapper;
 
 import com.xxfc.platform.universal.entity.IdInformation;
 import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Options;
-import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -11,6 +9,8 @@ import tk.mybatis.mapper.common.Mapper;
 public interface IdInformationMapper extends Mapper<IdInformation> {
 
     @Insert(value = "insert into id_information (user_login_id,name,id_number,certificate_type,front_url,back_url,expiration_date) " +
-                                       "values (#{userLonginId},#{name},#{idNumber},#{certificateType},#{frontUrl},#{backUrl},#{expirationDate})")
+                                       "values (#{userLoginId},#{name},#{idNumber},#{certificateType},#{frontUrl},#{backUrl},#{expirationDate})")
      void addIdInformation(IdInformation idInformation);
+
+    IdInformation selectByUserId(Integer userLoginId);
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java

@@ -4,13 +4,13 @@ package com.xxfc.platform.universal.service;
 import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
+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;
 import com.xxfc.platform.universal.entity.IdInformation;
 import com.xxfc.platform.universal.mapper.IdInformationMapper;
 import com.xxfc.platform.universal.utils.CertifHttpUtils;
 import com.xxfc.platform.universal.utils.Validation;
-import javafx.application.Application;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.map.HashedMap;
@@ -22,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
@@ -335,33 +334,32 @@ public class CertificationService {
             Example exa = new Example(IdInformation.class);
             Example.Criteria criteria = exa.createCriteria();
             criteria.andEqualTo("idNumber",idInformation.getIdNumber());
-            criteria.andEqualTo("userLonginId",idInformation.getUserLonginId());
-            List<IdInformation> idInformations = idInformationMapper.selectByExample(exa);
-            if (CollectionUtils.isEmpty(idInformations)) {
+//            criteria.andEqualTo("userLoginId",idInformation.getUserLoginId());
+            List<IdInformation> idInformatics = idInformationMapper.selectByExample(exa);
+            if (CollectionUtils.isEmpty(idInformatics)) {
                 idInformation.setCrtTime(new Date());
                 idInformationMapper.insertSelective(idInformation);
             }else {
-                IdInformation idInformation1 = idInformations.get(0);
-                idInformation.setId(idInformation1.getId());
-                idInformation.setUpdTime(new Date());
-                idInformationMapper.updateByPrimaryKeySelective(idInformation);
+//                IdInformation idInformation1 = idInformatics.get(0);
+//                idInformation.setId(idInformation1.getId());
+//                idInformation.setUpdTime(new Date());
+//                idInformationMapper.updateByPrimaryKeySelective(idInformation);
+                throw new BaseException("该身份证已存在,不要重复认证!");
             }
-            log.info("----addIdInformation---userid==="+idInformation.getUserLonginId()+"----name====" + idInformation.getName()+"---IdNumber==="+idInformation.getIdNumber());
+            log.info("----addIdInformation---userid==="+idInformation.getUserLoginId()+"----name====" + idInformation.getName()+"---IdNumber==="+idInformation.getIdNumber());
             //认证成功后修改用户,用户认证状态
-            ObjectRestResponse authentication = userFeign.authentication(idInformation.getUserLonginId(), idInformation.getName(), idInformation.getIdNumber(), 1);
+            ObjectRestResponse authentication = userFeign.authentication(idInformation.getUserLoginId(), idInformation.getName(), idInformation.getIdNumber(), 1);
            return ObjectRestResponse.succ(idInformation.getId());
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus();
             return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA,"无法识别,请重新上传");
         }
-
-
-
-
     }
 
-
+    public IdInformation getByUser(Integer userId) {
+        return idInformationMapper.selectByUserId(userId);
+    }
 
 }
 

xx-universal/xx-universal-server/src/main/resources/mapper/IdInformationMapper.xml

@@ -6,14 +6,16 @@
         <result property="id" column="id"/>
         <result property="idNumber" column="id_number"/>
         <result property="name" column="name"/>
-        <result property="userLonginId" column="user_login_id"/>
+        <result property="userLoginId" column="user_login_id"/>
         <result property="certificateType" column="certificate_type"/>
         <result property="frontUrl" column="front_url"/>
         <result property="backUrl" column="back_url"/>
         <result property="expirationDate" column="expiration_date"/>
         <result property="authenticationMethods" column="authentication_methods"/>
     </resultMap>
-
+    <select id="selectByUserId" resultType="com.xxfc.platform.universal.entity.IdInformation" parameterType="java.lang.Integer">
+        select * from id_information where user_login_id = #{userLoginId}
+    </select>
 
 
 </mapper>
\ No newline at end of file

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/common/BehaviorEnum.java

@@ -26,12 +26,12 @@ public enum BehaviorEnum {
     /**
      * 精彩活动点击
      */
-    WONDERFUL_ACTIVITY_CLICK(3, "精彩活动点击"),
+    WONDERFUL_ACTIVITY_CLICK(3, "精选活动点击"),
 
     /**
      * 注册
      */
-    REGISTRY(4, "成功注册"),
+    REGISTRY(4, "注册成功"),
 
     /**
      * 活动页面访问量

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/dto/ActivityBehaviorRelationDTO.java

+package com.xxfc.platform.user.behavior.dto;
+
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 17:05
+ */
+@Data
+public class ActivityBehaviorRelationDTO {
+
+
+    /**
+     * @see com.xxfc.platform.user.behavior.common.BehaviorEnum
+     * 行为类型
+     */
+    private Integer type;
+
+    /**
+     * 业务id (banner 精彩活动 app弹窗)
+     */
+    private Integer bizId;
+
+    /**
+     * 活动id
+     */
+    private Integer activityId;
+
+}

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/entity/ActivityBehaviorRelation.java

+package com.xxfc.platform.user.behavior.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 17:05
+ */
+@Data
+@Table(name = "activity_behavior_relation")
+public class ActivityBehaviorRelation {
+
+     @Id
+     @GeneratedValue(generator = "JDBC")
+      private Integer id;
+
+    /**
+     * @see com.xxfc.platform.user.behavior.common.BehaviorEnum
+     * 行为类型
+     */
+    private Integer type;
+
+    /**
+     * 业务id (banner 精彩活动 app弹窗)
+     */
+    @Column(name = "biz_id")
+    private Integer bizId;
+
+    /**
+     * 活动id
+     */
+    @Column(name = "activity_id")
+    private Integer activityId;
+
+}

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/vo/BehaviorNoteCollectVo.java

@@ -19,7 +19,7 @@ import java.io.Serializable;
 @AllArgsConstructor
 public class BehaviorNoteCollectVo implements Serializable {
     /**
-     * @see com.xxfc.platform.user.behavior.common.BehaviorEnum   + 成功邀请人数 ，邀请人数>=10 ，App 访问量
+     * @see com.xxfc.platform.user.behavior.common.BehaviorEnum
      * 行为
      */
     private String behavior;

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/UserBeHaviorApplication.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.user.behavior;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import tk.mybatis.spring.annotation.MapperScan;
@@ -13,9 +14,12 @@ import tk.mybatis.spring.annotation.MapperScan;
  * @data 2019/8/12 10:04
  */
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = "com.xxfc.platform.*.feign")
+@EnableFeignClients(basePackages = {"com.xxfc.platform.*.feign","com.github.wxiaoqi.security.*.feign"})
 @MapperScan(basePackages = "com.xxfc.platform.user.behavior.mapper")
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages ={
+        "com.xxfc.platform",
+        "com.github.wxiaoqi.security.admin.support"
+},exclude = {MongoAutoConfiguration.class})
 public class UserBeHaviorApplication {
     public static void main(String[] args) {
         SpringApplication.run(UserBeHaviorApplication.class,args);

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/biz/ActivityBehaviorBiz.java

@@ -5,6 +5,7 @@ import com.xxfc.platform.user.behavior.dto.ActivityBehaviorDTO;
 import com.xxfc.platform.user.behavior.entity.ActivityBehavior;
 import com.xxfc.platform.user.behavior.mapper.ActivityBehaviorMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -15,6 +16,7 @@ import java.util.List;
  * @data 2019/8/13 14:10
  */
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class ActivityBehaviorBiz extends BaseBiz<ActivityBehaviorMapper, ActivityBehavior> {
 
        public List<ActivityBehaviorDTO> findActivityBehaviorsByActivityId(Integer activityId){

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/biz/ActivityBehaviorRelationBiz.java

+package com.xxfc.platform.user.behavior.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.user.behavior.dto.ActivityBehaviorRelationDTO;
+import com.xxfc.platform.user.behavior.entity.ActivityBehaviorRelation;
+import com.xxfc.platform.user.behavior.mapper.ActivityBehaviorRelationMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 17:12
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ActivityBehaviorRelationBiz extends BaseBiz<ActivityBehaviorRelationMapper, ActivityBehaviorRelation> {
+
+      public List<ActivityBehaviorRelationDTO> findActivityBehaviorRelationsByActivityId(Integer activityId){
+          return  mapper.selectAllByActivityId(activityId);
+      }
+}

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/biz/BehaviorTypeBiz.java

@@ -4,10 +4,9 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.user.behavior.dto.BehaviorTypeDTO;
 import com.xxfc.platform.user.behavior.entity.BehaviorType;
 import com.xxfc.platform.user.behavior.mapper.BehaviorTypeMapper;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -17,17 +16,11 @@ import java.util.List;
  * @data 2019/8/13 14:09
  */
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class BehaviorTypeBiz extends BaseBiz<BehaviorTypeMapper, BehaviorType> {
 
        public List<BehaviorTypeDTO> findBehaviorTypesByIds(List<Integer> typeIds){
-           List<BehaviorTypeDTO> behaviorTypeDTOS = new ArrayList<>();
-           List<BehaviorType> behaviorTypes = mapper.selectByIdList(typeIds);
-            BehaviorTypeDTO behaviorTypeDTO;
-           for (BehaviorType behaviorType : behaviorTypes) {
-               behaviorTypeDTO = new BehaviorTypeDTO();
-               BeanUtils.copyProperties(behaviorType,behaviorTypeDTO);
-               behaviorTypeDTOS.add(behaviorTypeDTO);
-           }
-           return behaviorTypeDTOS;
+           return mapper.selectAllByIdList(typeIds);
        }
+
 }

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/mapper/ActivityBehaviorMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @data 2019/8/13 14:10
  */
 public interface ActivityBehaviorMapper extends Mapper<ActivityBehavior> {
-    @Select("select `behavior_type_id` from `activity_behavior` where `activity_id`=#{activityId}")
+    @Select("select `activity_id`,`behavior_type_id` from `activity_behavior` where `activity_id`=#{activityId}")
     @Results(value = {
             @Result(column = "activity_id",property = "activityId"),
             @Result(column = "behavior_type_id",property = "behaviorTypeId")

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/mapper/ActivityBehaviorRelationMapper.java

+package com.xxfc.platform.user.behavior.mapper;
+
+import com.xxfc.platform.user.behavior.dto.ActivityBehaviorRelationDTO;
+import com.xxfc.platform.user.behavior.entity.ActivityBehaviorRelation;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 17:11
+ */
+public interface ActivityBehaviorRelationMapper extends Mapper<ActivityBehaviorRelation> {
+
+    @Select("select `type`,`biz_id`,`activity_id` from `activity_behavior_relation` where `activity_id`=#{activityId}")
+    @Results(value = {
+            @Result(property = "type",column = "type"),
+            @Result(property = "bizId",column = "biz_id"),
+            @Result(property = "activityId",column = "activity_id")
+    })
+    List<ActivityBehaviorRelationDTO> selectAllByActivityId(@Param("activityId") Integer activityId);
+}

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/mapper/BehaviorTypeMapper.java

 package com.xxfc.platform.user.behavior.mapper;
 
+import com.xxfc.platform.user.behavior.dto.BehaviorTypeDTO;
 import com.xxfc.platform.user.behavior.entity.BehaviorType;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.additional.idlist.IdListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 /**
  * @author libin
  * @version 1.0
@@ -11,4 +18,11 @@ import tk.mybatis.mapper.common.Mapper;
  * @data 2019/8/13 14:13
  */
 public interface BehaviorTypeMapper extends Mapper<BehaviorType>, IdListMapper<BehaviorType,Integer> {
+
+    @Select("<script>select `name`,`code` from  behavior_type where `id` in <foreach collection='typeIds' open='(' item='typeId' separator=',' close=')'> #{typeId}</foreach></script>")
+    @Results(value = {
+            @Result(column = "name",property = "name"),
+            @Result(column ="code",property = "code")
+    })
+    List<BehaviorTypeDTO> selectAllByIdList(@Param("typeIds") List<Integer> typeIds);
 }

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/mapper/CustomerBehaviorNotesMapper.java

@@ -17,5 +17,7 @@ public interface CustomerBehaviorNotesMapper extends Mapper<CustomerBehaviorNote
 
     List<CustomerBehaviorNotes> selectByActivityIdAndTime(@Param("activityId") Integer activityId,@Param("startTime") Long startTime,@Param("endTime") Long endTime);
 
-    long selectAppVvisitsByType(@Param("code") int code);
+    long selectAppVvisitsByTypeAndTime(@Param("code") int code,@Param("startTime") Long startTime,@Param("endTime") Long endTime);
+
+    List<CustomerBehaviorNotes> selectAllByTypeIdsAndTime(@Param("bizIds") List<Integer> bizIds,@Param("startTime") Long startTime,@Param("endTime") Long endTime);
 }

xx-user-behavior-collect/xx-user-behavior-server/src/main/resources/mapper/CustomerBehaviorNotesMapper.xml

@@ -27,7 +27,33 @@
         </if>
     </select>
 
-    <select id="selectAppVvisitsByType" resultType="long">
+    <select id="selectAppVvisitsByTypeAndTime" resultType="long">
         select count(id) from `customer_behavior_notes` where `type`=#{code}
+        <if test="startTime != null != null and endTime !=null">
+            and `crt_time` between #{startTime} and #{endTime}
+        </if>
+        <if test="startTime != null and endTime == null">
+            and <![CDATA[`crt_time` >= #{startTime}]]>
+        </if>
+        <if test="endTime != null and startTime == null">
+            and <![CDATA[ `crt_time` <= #{endTime}]]>
+        </if>
+    </select>
+
+    <select id="selectAllByTypeIdsAndTime" resultMap="customerBehaviorNotesMap">
+        select * from  `customer_behavior_notes` where `type_id` in
+        <foreach collection="bizIds" item="bizId" open="(" close=")" separator=",">
+            #{bizId}
+        </foreach>
+        <if test="startTime != null != null and endTime !=null">
+            and `crt_time` between #{startTime} and #{endTime}
+        </if>
+        <if test="startTime != null and endTime == null">
+            and <![CDATA[`crt_time` >= #{startTime}]]>
+        </if>
+        <if test="endTime != null and startTime == null">
+            and <![CDATA[ `crt_time` <= #{endTime}]]>
+        </if>
+        and `type` in(0,1,2,3)
     </select>
 </mapper>
\ No newline at end of file

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

@@ -24,11 +24,14 @@ public enum ResCode {
     VEHICLE_BOOKED_RECORD_STATUS_CHANGED(103002,"车辆预定申请状态已变更"),
     VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED(103003,"请输入仪表盘内当前显示的公里数"),
 
+    CHECKUSER_AND_PHONE_NOT_NULL(103999, "收车或交车人姓名和电话不能为空"),
+    USERNAME_AND_TELE_NOT_NULL(104000, "使用人和电话不能为空"),
     VEHICLE_DEPARTURE_VEHICLE_UNEXIST(104001,"车辆不存在"),
     VEHICLE_DEPARTURE_VEHICLE_DISABLE(104002,"车辆不可用"),
     VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE(104003,"车辆未出车"),
 
     VEHICLE_BOOK_RECORD_IS_NOT_EXIST(104004, "预约记录不存在"),
+    VEHICLE_UNBOOK_FAIL(104005, "取消预定失败！"),
 
     BRANCH_COMPANY_UNEXIST(105001, "分公司信息不存在"),
     BRANCH_COMPANY_STOCK_EXISTED(105002, "分公司股权信息已存在"),

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBookRecord.java

@@ -180,12 +180,26 @@ public class VehicleBookRecord {
      */
     private String orderNo;
 
+    /**
+     * 使用人姓名
+     */
     @Column(name = "vehicle_username")
     private String vehicleUsername;
-
+    /**
+     * 使用人电话
+     */
     @Column(name = "vehicle_user_phone")
     private String vehicleUserPhone;
 
+    /**
+     * 保养项id
+     */
     @Column(name = "upkeep_ids")
     private String upkeepIds;
+
+    /**
+     * 驳回理由
+     */
+    @Column(name = "reject_remark")
+    private String rejectRemark;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -54,12 +54,12 @@ public interface VehicleFeign {
     public RestResponse<Integer> rentRejectVehicleBooking(@PathVariable(value = "bookRecordId") Long bookRecordId);
 
     //取消预约
-    @RequestMapping(value = "/vehicleInfo/unbook/4employee/{bookRecordId}", method = RequestMethod.DELETE)
-    public RestResponse<Integer> unbookVehicle(@PathVariable(value = "bookRecordId") Long bookRecordId);
+    @RequestMapping(value = "/vehicleInfo/rent/unbook/{bookRecordId}", method = RequestMethod.DELETE)
+    public RestResponse<Integer> rentUnbookVehicle(@PathVariable(value = "bookRecordId") Long bookRecordId);
 
     //通过预约
-    @RequestMapping(value = "/vehicleInfo/book/4employee/prove/{bookRecordId}", method = RequestMethod.PUT)
-    public RestResponse<Integer> proveVehicleBooking(@PathVariable(value = "bookRecordId") Long bookRecordId);
+    @RequestMapping(value = "/vehicleInfo/rent/book/prove/{bookRecordId}", method = RequestMethod.PUT)
+    public RestResponse<Integer> rentProveVehicleBooking(@PathVariable(value = "bookRecordId") Long bookRecordId);
 
     //获取分公司列表
     @GetMapping("/branchCompany/all")

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

@@ -103,4 +103,19 @@ public class BookVehicleVO {
     private String upkeepIds;
 
     private String orderNo;
+
+    /**
+     * book_record状态
+     */
+    private Integer status;
+
+    /**
+     * 驳回理由
+     */
+    private String rejectRemark;
+
+    /**
+     * 不检查参数合法
+     */
+    private Boolean notCheckTimeLegal;
 }
\ No newline at end of file

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

@@ -14,9 +14,6 @@ public class CompanyDetail extends BranchCompany {
         StringBuilder detailAddrStr = new StringBuilder("");
         if(null != this.getSysRegions() && this.getSysRegions().size() > 0) {
             for(SysRegion sysRegion : this.getSysRegions()) {
-//                if(0 != detailAddrStr.length()) {
-//
-//                }
                 String name = sysRegion.getName()
                         .replace("省", "")
                         .replace("市", "")
@@ -27,7 +24,9 @@ public class CompanyDetail extends BranchCompany {
                 }
             }
         }
-
+        if(this.getAddrDetail().contains(detailAddrStr)) {
+            return this.getAddrDetail();
+        }
         detailAddrStr.append(this.getAddrDetail());
         return detailAddrStr.toString();
     }

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

@@ -2,6 +2,8 @@ package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  *车辆相关预警消息
  *
@@ -29,4 +31,8 @@ public class QueryVehicleWarningMsgVo {
     private Integer page;
 
     private Integer limit;
+
+    private Integer colorType;
+
+    private List<Integer> companyIds;
 }

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

@@ -60,6 +60,12 @@ public class RentVehicleBookDTO extends PageParam {
     @ApiModelProperty("停靠公司id")
     Integer parkBranchCompanyId;
 
+    @ApiModelProperty("指定车牌")
+    String numberPlate;
+
+    @ApiModelProperty("指定预约状态")
+    Integer status;
+
     /**
      * 随车物品id以及数量 List<Map<id,数量>>
      */

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

@@ -26,6 +26,10 @@ public class UsableVeicleDTO extends PageParam {
         String startDate;
         @ApiModelProperty(hidden = true)
         String endDate;
+        @ApiModelProperty(hidden = true)
+        String startDateExtend;
+        @ApiModelProperty(hidden = true)
+        String endDateExtend;
         @ApiModelProperty("开始时间戳")
         Long startDateTamp;
         @ApiModelProperty("结束时间戳")
@@ -39,13 +43,13 @@ public class UsableVeicleDTO extends PageParam {
         @ApiModelProperty(value = "分类列表", hidden = true)
         Map<Integer, List<VehiclePlatCata>> catas;
         @ApiModelProperty("停靠公司")
-        String parkBranchCompanyId;
+        Integer parkBranchCompanyId;
 
         @ApiModelProperty("开始公司Id")
-        String startCompanyId;
+        Integer startCompanyId;
 
         @ApiModelProperty("结束公司Id")
-        String endCompanyId;
+        Integer endCompanyId;
 
         @ApiModelProperty(hidden = true)
         Boolean yearNo4Where;
@@ -53,10 +57,12 @@ public class UsableVeicleDTO extends PageParam {
         public void setStartDateTamp(Long startDateTamp) {
             this.startDateTamp = startDateTamp;
             this.startDate = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(startDateTamp), ZoneOffset.ofHours(8)));
+            this.startDateExtend = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(startDateTamp), ZoneOffset.ofHours(8)).minusDays(1L));
         }
 
         public void setEndDateTamp(Long endDateTamp) {
                 this.endDateTamp = endDateTamp;
                 this.endDate = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(endDateTamp), ZoneOffset.ofHours(8)));
+                this.endDateExtend = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(endDateTamp), ZoneOffset.ofHours(8)).plusDays(1L));
         }
 }
\ No newline at end of file

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

@@ -34,5 +34,9 @@ public class VehiclePlanDto extends PageParam {
     private Integer zoneId;
 
     private List<Integer> companyIds;
+    /**
+     * 车辆用途 1、租赁，2、自用
+     */
+    private Integer useType;
 
 }

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

@@ -59,4 +59,5 @@ public class AreaBiz extends BaseBiz<AreaMapper, Area> implements UserRestInterf
     }
 
 
+
 }

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

@@ -13,6 +13,7 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
+import com.xxfc.platform.vehicle.entity.Area;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo;
 import com.xxfc.platform.vehicle.entity.SysRegion;
@@ -65,6 +66,9 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     @Autowired
     UserFeign userFeign;
 
+    @Autowired
+    private AreaBiz areaBiz;
+
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -77,6 +81,8 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     @Autowired
     private VehicleBiz vehicleBiz;
 
+
+
     /**
      * 按主键获取公司
      *
@@ -152,17 +158,35 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     }
 
     public PageDataVO<BranchCompany> getAll(Integer page, Integer limit, Integer addrProvince, Integer addrCity,
-                                            Integer addrTown, UserDTO userDTO) {
+                                            Integer addrTown,Integer zoneId, UserDTO userDTO) {
         Example example = new Example(BranchCompany.class);
         Example.Criteria criteria = example.createCriteria();
-        if (addrProvince != null) {
-            criteria.andCondition(" addr_province = '" + addrProvince + "'");
+        String provinceIds="";
+        if (Objects.nonNull(zoneId)){
+            Area area = areaBiz.selectById(zoneId);
+             provinceIds = area.getProvinceIds();
+        }
+        if (StringUtils.isNotEmpty(provinceIds)){
+            List<String> provinceIdList = Arrays.asList(provinceIds.split(","));
+            if (Objects.nonNull(addrProvince)){
+                if (provinceIdList.contains(String.valueOf(addrProvince))){
+                    criteria.andEqualTo("addrProvince",addrProvince);
+                }else {
+                  return   new PageDataVO<BranchCompany>();
+                }
+            }else {
+                criteria.andIn("addrProvince",provinceIdList);
+            }
+        }else {
+            if (addrProvince != null) {
+                criteria.andEqualTo("addrProvince",addrProvince);
+            }
         }
         if (addrCity != null) {
-            criteria.andCondition(" addr_city = '" + addrCity + "'");
+            criteria.andEqualTo("addrCity",addrCity);
         }
         if (addrTown != null) {
-            criteria.andCondition(" addr_town = '" + addrTown + "'");
+            criteria.andEqualTo("addrTown",addrTown);
         }
         if (userDTO != null && DATA_ALL_FALSE.equals(userDTO.getDataAll())) {
             if (StringUtils.isNotBlank(userDTO.getDataZone())) {
@@ -172,7 +196,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
                 criteria.andIn(ID, userDTO.dataCompany2List());
             }
         }
-        example.setOrderByClause("`id` asc");
+        example.setOrderByClause("`id` desc");
         PageHelper.startPage(page, limit);
         PageInfo<BranchCompany> branchCompanyPageInfo = new PageInfo<>(mapper.selectByExample(example));
         return PageDataVO.pageInfo(branchCompanyPageInfo);

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

@@ -10,6 +10,7 @@ import com.xxfc.platform.vehicle.constant.VehicleStatus;
 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.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -55,8 +56,16 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode());
         }
+        if(StringUtils.isBlank(departureVo.getUser()) || StringUtils.isBlank(departureVo.getUserTel())) {
+            throw new BaseException(ResCode.USERNAME_AND_TELE_NOT_NULL.getDesc(),
+                    ResCode.USERNAME_AND_TELE_NOT_NULL.getCode());
+        }
+        if(StringUtils.isBlank(departureVo.getCheckMan()) || StringUtils.isBlank(departureVo.getCheckManTel())) {
+            throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
+                    ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
+        }
         if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
-            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc(),
+            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
         Integer MileageLift=vehicle.getMileageLastUpdate();
@@ -75,8 +84,8 @@ public class VehicleActiveService {
             int result = vehicleMapper.updateStatusByIdAndStatus(departureVo.getVehicleId(), VehicleStatus.DEPARTURE.getCode(),
                     VehicleStatus.NORMAL.getCode());
 
-            if (result == 0) {
-                throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc(),
+            if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
+                throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
             }
             //修改预约记录状态
@@ -117,10 +126,35 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
+    }
 
-
-
-
+    public String getVehicleStatus(Integer status, String vehicleId) {
+        StringBuilder stringBuilder = new StringBuilder();
+        switch (status) {
+            case 1:
+                stringBuilder.append("正常运行");
+                break;
+            case 2:
+                stringBuilder.append("维修");
+                break;
+            case 3:
+                stringBuilder.append("报废");
+                break;
+            case 4:
+                stringBuilder.append("出车");
+                break;
+            case 5:
+                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());
+            }
+        return stringBuilder.toString();
     }
 
     @Transactional
@@ -130,8 +164,12 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode());
         }
+        if(StringUtils.isBlank(arrivalVo.getRecycleMan()) || StringUtils.isBlank(arrivalVo.getRecycleManTel())) {
+            throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
+                    ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
+        }
         if (!vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
-            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
+            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
         }
         Integer Mileagerest = vehicle.getMileageLastUpdate();

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

@@ -31,7 +31,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
     public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
 
-    public static  Map<String, Integer>  getPredictableHours(String bookStartDate, String bookEndDate) {
+    public  Map<String, Integer>  getPredictableHours(String bookStartDate, String bookEndDate, Boolean notCheckTimeLegal) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date startDate = null;
         Date endDate = null;
@@ -43,12 +43,15 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
         }
 
         //判定时间是否合法
-        if (bookStartDate.compareTo(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER)) < 0) {
-            throw new BaseException(ResultCode.ONLY_BOOK_FROM_TODAY);
-        }
-        if (bookStartDate.compareTo(bookEndDate) > 0) {
-            throw new BaseException(ResultCode.ONLY_BOOK_FROM_TODAY);
+        if(!Boolean.TRUE.equals(notCheckTimeLegal)) {
+            if (bookStartDate.compareTo(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER)) < 0) {
+                throw new BaseException(ResultCode.ONLY_BOOK_FROM_TODAY);
+            }
+            if (bookStartDate.compareTo(bookEndDate) > 0) {
+                throw new BaseException(ResultCode.ONLY_BOOK_FROM_TODAY);
+            }
         }
+
         Map<String, Integer> predictableHours = Maps.newHashMap();
         //预定开始小时
         int hour = new DateTime(startDate).hourOfDay().get();
@@ -68,12 +71,14 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
                 endPredictableHour |= 1 << (curentHour);
             }
         }
-
-        predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour);
-        predictableHours.put(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), endPredictableHour);
+        if(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER).equals(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER))) {//同一天预定
+            predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour & endPredictableHour);
+        } else {
+            predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour);
+            predictableHours.put(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), endPredictableHour);
+        }
         DateTime startDay = DateTime.parse(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
         DateTime endDay = DateTime.parse(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
-
         if(endDay.getDayOfMonth() - startDay.getDayOfMonth() >1){ //
             for (DateTime curDate = startDay.plusDays(1); curDate.compareTo(endDay) < 0; curDate = curDate.plusDays(1)) {
                 String curDateStr = curDate.toString(DATE_TIME_FORMATTER);
@@ -143,18 +148,9 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     }
 
     public static void main(String[] args) throws Exception{
-        String result = Integer.toBinaryString(16777200);
-        String newString = new StringBuilder(result).reverse().toString();
-        int i=newString.length()-result.replace("1", "").length();
-       System.out.println(i);
-
-        Map<String, Integer> map = getPredictableHours("2019-07-28 00:00:00","2019-07-29 00:00:00");
-        for (Map.Entry<String, Integer> entry : map.entrySet()) {
-            log.info(entry.getKey());
-            log.info(entry.getValue() + "");
-        }
-
-
+        int b = 16744448;
+        Integer a = b | 0;
+        System.out.println(a);
     }
 
 }

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

@@ -299,7 +299,9 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         return PageDataVO.pageInfo(vehiclePageInfo);
     }
 
-
+    public List<VehicleBookRecordVo> selectByVehicleId(String vehicleId) {
+        return mapper.selectByVehicleId(vehicleId);
+    }
 
 
     /**

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

@@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Maps;
@@ -44,7 +47,7 @@ import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @Service
-public class VehicleWarningMsgBiz extends BaseBiz<VehicleWarningMsgMapper, VehicleWarningMsg> {
+public class VehicleWarningMsgBiz extends BaseBiz<VehicleWarningMsgMapper, VehicleWarningMsg> implements UserRestInterface {
 
 
     private static final Integer CHECK_BATCH_SIZE_VEHICLE = 100;//每批次检查多少辆车
@@ -67,7 +70,15 @@ public class VehicleWarningMsgBiz extends BaseBiz<VehicleWarningMsgMapper, Vehic
 
     @Autowired
     private RedisTemplate customRedisTemplate;
+    @Autowired
+    UserFeign userFeign;
+    @Autowired
+    VehicleBiz vehicleBiz;
 
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
     /**
      * 增加自定义预警消息
      * @param addVehicleWarningMsgVo
@@ -94,7 +105,18 @@ public class VehicleWarningMsgBiz extends BaseBiz<VehicleWarningMsgMapper, Vehic
         try {
             QueryVehicleWarningMsgVo queryVehicleWarningMsgVo = JSON.parseObject(queryVehicleWarningMsgVoJson, QueryVehicleWarningMsgVo.class);
             PageHelper.startPage(queryVehicleWarningMsgVo.getPage(),queryVehicleWarningMsgVo.getLimit());
-            List<VehicleWarningMsg> vehicleWarningMsgs = mapper.getByPages(queryVehicleWarningMsgVo);
+            UserDTO userDTO = getAdminUserInfo();
+            if (userDTO != null) {
+                if (userDTO.getDataAll() == 2) {
+                    List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
+                    if(companyList != null && companyList.size() > 0) {
+                        queryVehicleWarningMsgVo.setCompanyIds(companyList);
+                    }
+                }
+            } else {
+                return RestResponse.codeAndMessage(1032,"token失效");
+            }
+            List<VehicleWarningMsg> vehicleWarningMsgs = mapper.getByPage(queryVehicleWarningMsgVo);
             PageInfo<VehicleWarningMsg> vehicleWarningMsgPageInfo = new PageInfo<>(vehicleWarningMsgs);
             return RestResponse.data(PageDataVO.pageInfo(vehicleWarningMsgPageInfo));
         } catch (JSONException ex) {
@@ -230,4 +252,5 @@ public class VehicleWarningMsgBiz extends BaseBiz<VehicleWarningMsgMapper, Vehic
         return list;
     }
 
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookRecordMapper.java

@@ -30,7 +30,7 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
 
     public List<VehicleRecordInfoVo> getByParam(Map<String, Object> params);
 
-    public List<VehicleBookRecord> getByVehicleId(String vehicleId);
+    public List<VehicleBookRecordVo> selectByVehicleId(String vehicleId);
 
     public List<VehicleBookRecordVo> getBookRecord(VehicleBookRecordQueryVo vehicleBookRecordQueryVo);
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java

@@ -6,11 +6,14 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.vehicle.biz.AreaBiz;
 import com.xxfc.platform.vehicle.biz.BranchCompanyBiz;
 import com.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.common.BaseController;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
+import com.xxfc.platform.vehicle.entity.Area;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
@@ -49,12 +52,15 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
     @Autowired
     private UserAuthConfig userAuthConfig;
 
+    @Autowired
+    private AreaBiz areaBiz;
+
     @RequestMapping(value ="/page",method = RequestMethod.GET)
     public RestResponse<PageDataVO<BranchCompany>> page(@RequestParam Integer page, @RequestParam Integer limit,
                                                         @RequestParam(required = false) Integer addrProvince, @RequestParam(required = false) Integer addrCity,
-                                                        @RequestParam(required = false) Integer addrTown, @RequestParam(required = false) String location) {
+                                                        @RequestParam(required = false) Integer addrTown, @RequestParam(required = false) Integer zoneId) {
         UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
-        return RestResponse.data(baseBiz.getAll(page,limit,addrProvince,  addrCity, addrTown, userDTO));
+        return RestResponse.data(baseBiz.getAll(page,limit,addrProvince,  addrCity, addrTown, zoneId,userDTO));
     }
 
     @IgnoreUserToken
@@ -62,7 +68,7 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
     public RestResponse<PageDataVO<BranchCompany>> allPage(@RequestParam Integer page, @RequestParam Integer limit,
                                                            @RequestParam(required = false) Integer addrProvince, @RequestParam(required = false) Integer addrCity,
                                                            @RequestParam(required = false) Integer addrTown) {
-        return RestResponse.data(baseBiz.getAll(page,limit,addrProvince,  addrCity, addrTown, null));
+        return RestResponse.data(baseBiz.getAll(page,limit,addrProvince,  addrCity, addrTown, null,null));
     }
 
     @RequestMapping(value ="/search",method = RequestMethod.GET)
@@ -89,8 +95,16 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
     }
 
     @RequestMapping(value ="",method = RequestMethod.POST)
-    public RestResponse<Integer> add(@RequestBody BranchCompanyVo branchCompanyVo) {
-        return RestResponse.data(baseBiz.add(branchCompanyVo));
+    public ObjectRestResponse<Integer> add(@RequestBody BranchCompanyVo branchCompanyVo) {
+        if (branchCompanyVo==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+        }
+        Area area=areaBiz.selectById(branchCompanyVo.getZoneId());
+        Integer provinc=branchCompanyVo.getAddrProvince()==null?0:branchCompanyVo.getAddrProvince();
+        if (area==null||StringUtils.isBlank(area.getProvinceIds())||!area.getProvinceIds().contains(provinc+"")){
+            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"片区和省份不一致");
+        }
+            return ObjectRestResponse.succ(baseBiz.add(branchCompanyVo));
     }
 
     @RequestMapping(value ="/app/unauth/getByZone",method = RequestMethod.GET)
@@ -113,9 +127,17 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
     }
 
     @RequestMapping(value ="",method = RequestMethod.PUT)
-    public RestResponse update(@RequestBody BranchCompany branchCompany) {
+    public ObjectRestResponse update(@RequestBody BranchCompany branchCompany) {
+        if (branchCompany==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+        }
+        Area area=areaBiz.selectById(branchCompany.getZoneId());
+        Integer provinc=branchCompany.getAddrProvince()==null?0:branchCompany.getAddrProvince();
+        if (area==null||StringUtils.isBlank(area.getProvinceIds())||!area.getProvinceIds().contains(provinc+"")){
+            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"片区和省份不一致");
+        }
         baseBiz.update(branchCompany);
-        return RestResponse.sucResponse();
+        return ObjectRestResponse.succ();
     }
 
     @RequestMapping(value ="/{id}",method = RequestMethod.DELETE)

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

+package com.xxfc.platform.vehicle.rest;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+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;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.vehicle.biz.VehicleBiz;
+import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
+import com.xxfc.platform.vehicle.common.BaseController;
+import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.constant.BookType;
+import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
+import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
+import com.xxfc.platform.vehicle.pojo.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.HashSet;
+
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
+import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP;
+import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP_NAME;
+
+@RestController
+@RequestMapping("/vehicleInfo")
+@Slf4j
+@IgnoreClientToken
+@Api(value="租车相关车辆管理controller",tags={"租车相关车辆管理接口"})
+public class RentVehicleController extends BaseController<VehicleBiz> implements UserRestInterface {
+
+    @Autowired
+    private VehiclePlatCataBiz vehiclePlatCataBiz;
+
+    @Autowired
+    UserFeign userFeign;
+
+    @Autowired
+    VehicleBiz vehicleBiz;
+
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
+    /**
+     * 租车拒绝预定车辆申请
+     *
+     * @param bookRecordId
+     * @return
+     */
+    @RequestMapping(value = "/rent/book/reject/{bookRecordId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "租车拒绝预定车辆")
+    @IgnoreUserToken
+    public RestResponse<Integer> rentRejectVehicleBooking(@PathVariable Long bookRecordId) throws Exception {
+        //默认USER_APP 预约
+        Integer operatorId = USER_APP;
+        String userName = USER_APP_NAME;
+        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.REJECTED.getCode(), userName, "租车订单取消", Boolean.TRUE);
+    }
+
+    /**
+     * 取消车辆预订
+     *
+     * @param bookRecordId
+     * @return
+     */
+    @RequestMapping(value = "/rent/unbook/{bookRecordId}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "取消预定车辆")
+    @IgnoreUserToken
+    public RestResponse<Integer> rentUnbookVehicle(@PathVariable Long bookRecordId) throws Exception {
+        //默认USER_APP 预约
+        Integer operatorId = USER_APP;
+        String userName = USER_APP_NAME;
+        return baseBiz.unbookVehicle4Employee(operatorId, bookRecordId, userName,null, Boolean.TRUE);
+    }
+
+    /**
+     * 批准预定车辆预定
+     *
+     * @param bookRecordId
+     * @return
+     */
+    @RequestMapping(value = "/rent/book/prove/{bookRecordId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "预定车辆审核通过")
+    @IgnoreUserToken
+    public RestResponse<Integer> rentProveVehicleBooking(@PathVariable Long bookRecordId) throws Exception {
+        //默认USER_APP 预约
+        Integer operatorId = USER_APP;
+        String userName = USER_APP_NAME;
+        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.APPROVE.getCode(), userName, "", Boolean.TRUE);
+    }
+
+    /**
+     * 可用车辆查询
+     *
+     * @param dto
+     * @return
+     */
+    @ApiOperation("可用车辆查询")
+    @RequestMapping(value = "/rent/usable-vehicle", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse<PageDataVO<UsableVehicleModelVO>> rentUsableVehicle(UsableVeicleDTO dto) throws Exception {
+        //根据时间 获得 可用车辆
+        //结合车型
+        if (StringUtils.isNotBlank(dto.getCatasStr())) {
+            dto.setCatas(vehiclePlatCataBiz.groupCatasByParent(dto.getCatasStr()));
+        }
+        //设置显示是否有车
+        dto.setYearNo4Where(Boolean.TRUE);
+        return ObjectRestResponse.succ(vehicleBiz.searchUsableModel(dto));
+    }
+
+    /**
+     * 热门车型
+     *
+     * @param dto
+     * @return
+     */
+    @ApiOperation("热门车型")
+    @RequestMapping(value = "/rent/hot-vehicle", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse<PageDataVO<UsableVehicleModelVO>> hotVehicle(HotVeicleDTO dto) throws Exception {
+        return ObjectRestResponse.succ(vehicleBiz.hotModel(dto));
+    }
+
+    /**
+     * 租车触发的申请预定车辆
+     *
+     * @param dto
+     * @return
+     */
+    @ApiOperation("租车触发的申请预定车辆")
+    @RequestMapping(value = "/rent/book/vehicle", method = RequestMethod.POST)
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public ObjectRestResponse<VehicleBookRecord> rentApplyVehicle(@RequestBody RentVehicleBookDTO dto) throws Exception {
+        //默认USER_APP 预约
+        Integer operatorId = USER_APP;
+        String userName = dto.getUserName();
+        String bookVehicleId;
+        if(StrUtil.isNotBlank(dto.getNumberPlate())) {
+            Vehicle vehicle = vehicleBiz.selectOne(new Vehicle(){{
+                setNumberPlate(dto.getNumberPlate());
+                setIsDel(SYS_FALSE);
+            }});
+            bookVehicleId = vehicle.getId();
+        }else {
+            dto.setLimit(1);
+            dto.setPage(1);
+            dto.setParkBranchCompanyId(dto.getLiftCompany());
+            //查询可车辆信息
+            PageDataVO<Vehicle> pageDataVO = vehicleBiz.searchUsableVehicle(dto);
+            if (pageDataVO.getData().size() <= 0) {
+                throw new BaseException(ResultCode.NOTEXIST_CODE, new HashSet<String>(){{
+                    add("可用车辆不存在");
+                }});
+            }
+            bookVehicleId = pageDataVO.getData().get(0).getId();
+        }
+        //判断是否为今天，如果是则设置为一分钟后开始
+        if(DateUtil.today().equals(dto.getBookStartDate())) {
+            LocalDateTime ldt = LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis()), ZoneOffset.ofHours(8)).plusSeconds(30L);
+            dto.setBookStartDate(DateTimeFormatter.ofPattern(DATE_TIME_LINE).format(ldt));
+        }else {
+            dto.setBookStartDate(dto.getBookStartDate()+ " 00:00:00");
+        }
+        dto.setBookEndDate(dto.getBookEndDate()+ " 23:59:59");
+        BookVehicleVO bookVehicleVo = BeanUtil.toBean(dto, BookVehicleVO.class);
+        bookVehicleVo.setBookType(BookType.USER_RENT.getCode());
+        bookVehicleVo.setVehicleId(bookVehicleId);
+        if(null != dto.getStatus()) {
+            bookVehicleVo.setStatus(dto.getStatus());
+        }else {
+            bookVehicleVo.setStatus(VehicleBookRecordStatus.APPLY.getCode());
+        }
+        VehicleBookRecord vehicleBookRecord = baseBiz.applyVehicle(operatorId, bookVehicleVo, userName);
+        return ObjectRestResponse.succ(vehicleBookRecord);
+    }
+}

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

@@ -47,7 +47,9 @@
         <if test="haveViolation != null">
             have_violation =#{haveViolation},
         </if>
-
+        <if test="rejectRemark != null">
+            reject_remark = #{rejectRemark},
+        </if>
         `status` = #{status}
         where id = #{id} and `status` = #{statusCondition}
     </update>
@@ -367,11 +369,9 @@
     </select>
     <select id="getByVehicleId" parameterType="java.lang.String"
             resultType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo">
-       SELECT v1.*, conv(v2.booked_hour,10,2) startHour,conv(v3.booked_hour,10,2) endHour,bc2.name retCompanyName from vehicle_book_record v1
-        LEFT JOIN vehicle_book_hour_info v2 on v2.book_record_id = v1.id and YEAR(v2.year_month_day) = YEAR(v1.book_start_date) AND MONTH(v2.year_month_day) = MONTH(v1.book_start_date) AND DAY(v2.year_month_day) =DAY(v1.book_start_date)
-        LEFT JOIN vehicle_book_hour_info v3 on v3.book_record_id = v1.id and YEAR(v3.year_month_day) = YEAR(v1.book_end_date) AND MONTH(v3.year_month_day) = MONTH(v1.book_end_date) AND DAY(v3.year_month_day) =DAY(v1.book_end_date)
-        LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
-        where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2  and v1.book_end_date
+       SELECT v1.*,bc2.name retCompanyName from vehicle_book_record v1
+               LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
+        where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2
     </select>
     <select id="getByParam" parameterType="java.util.Map" resultMap="getVehicleMap">
         select v1.* from vehicle_book_record v1

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

@@ -380,16 +380,19 @@
             <if test="status != null">
                 and v1.status = #{status}
             </if>
-            <if test="subordinateBranch != null">
-                and v1.subordinate_branch = #{subordinateBranch}
-            </if>
-            <if test="parkBranchCompanyId != null">
-                and v1.park_branch_company_id = #{parkBranchCompanyId}
+            <if test="companyIds != null and companyIds.size > 0">
+                and v1.park_branch_company_id in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
             </if>
             <if test="zoneId !=null">
                 and bc2.zone_id = #{zoneId}
             </if>
-            and is_del != 1
+            <if test="useType != null">
+                and v1.use_type = #{useType}
+            </if>
+            and v1.is_del != 1
         </where>
     </select>
 
@@ -397,7 +400,7 @@
         select v1.*,bc3.name parkCompanyName  from vehicle v1
         LEFT JOIN branch_company bc3 ON v1.park_branch_company_id = bc3.id
        <where>
-           <if test="numberPlate != null">
+           <if test="numberPlate != null and numberPlate != ''">
                and v1.number_plate = #{numberPlate}
            </if>
            <if test="companyIds != null and companyIds.size > 0">
@@ -412,7 +415,7 @@
                    #{id}
                </foreach>
            </if>
-           and is_del != 1
+           and v1.is_del != 1
        </where>
         ORDER BY parkCompanyName
     </select>
@@ -455,21 +458,19 @@
             <if test="startTime != null">
                 and v1.create_time between #{startTime} and #{endTime}
             </if>
-            <if test="numberPlate != null">
+            <if test="numberPlate != null and numberPlate != ''">
                 and v1.number_plate = #{numberPlate}
             </if>
             <if test="status != null">
                 and v1.status = #{status}
             </if>
-            <if test="subordinateBranch != null">
-                and v1.subordinate_branch = #{subordinateBranch}
-            </if>
-            <if test="parkBranchCompanyId != null">
-                and v1.park_branch_company_id = #{parkBranchCompanyId}
-            </if>
-            <if test="zoneId !=null">
-                and bc1.zone_id = #{zoneId}
+            <if test="companyIds != null and companyIds.size > 0">
+                and v1.park_branch_company_id in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
             </if>
+            and v1.is_del != 1
         </where>
         GROUP BY v1.status
         union all
@@ -480,21 +481,19 @@
             <if test="startTime != null">
                 and v2.create_time between #{startTime} and #{endTime}
             </if>
-            <if test="numberPlate != null">
+            <if test="numberPlate != null and numberPlate != ''">
                 and v2.number_plate = #{numberPlate}
             </if>
             <if test="status != null">
                 and v2.status = #{status}
             </if>
-            <if test="subordinateBranch != null">
-                and v2.subordinate_branch = #{subordinateBranch}
-            </if>
-            <if test="parkBranchCompanyId != null">
-                and v2.park_branch_company_id = #{parkBranchCompanyId}
-            </if>
-            <if test="zoneId !=null">
-                and bc2.zone_id = #{zoneId}
+            <if test="companyIds != null and companyIds.size > 0">
+                and v2.park_branch_company_id in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
             </if>
+            and v2.is_del != 1
         </where>
     </select>
 
@@ -641,6 +640,8 @@
                 and v.park_branch_company_id = #{parkBranchCompanyId}
             </if>
             and v.is_del = 0
+            and v.status != 3
+            and v.use_type = 1
         </where>
     </sql>
 
@@ -659,7 +660,7 @@
         , vbre.ret_company as to_lift_company
         , vbrs.lift_company as to_return_company
         from
-        (select vehicle_id, max(if(book_end_date &lt; #{start_date_extend}, book_end_date, null)) as max_book_end_date, min(if(book_start_date &gt; #{end_date_extend}, book_start_date, null)) as min_book_start_date from vehicle_book_record where status != 4 and status != 6 group by vehicle_id) sevbr
+        (select vehicle_id, max(if(book_end_date &lt; #{startDateExtend}, book_end_date, null)) as max_book_end_date, min(if(book_start_date &gt; #{endDateExtend}, book_start_date, null)) as min_book_start_date from vehicle_book_record where status != 4 and status != 6 group by vehicle_id) sevbr
         left join vehicle_book_record vbre
         on sevbr.vehicle_id = vbre.vehicle_id and sevbr.max_book_end_date = vbre.book_end_date and vbre.status != 4 and vbre.status != 6
         left join vehicle_book_record vbrs

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

@@ -22,9 +22,17 @@
             and v.number_plate = #{numberPlate}
         </if>
         <if test="type != null">
-            and type = #{type}
+            and vwn.type = #{type}
+        </if>
+        <if test="colorType != null">
+            and vwn.color_type = #{colorType}
+        </if>
+        <if test="companyIds != null and companyIds.size > 0">
+            and v.park_branch_company_id in
+            <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
         </if>
-
     </select>
 
     <select id="getMsgByVehicle" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleWarningMsg" >
@@ -44,20 +52,17 @@
             <if test="startTime != null">
                 and w.create_time between #{startTime} and #{endTime}
             </if>
-            <if test="numberPlate != null">
+            <if test="numberPlate != null and numberPlate != ''">
                 and v.number_plate = #{numberPlate}
             </if>
             <if test="status != null">
                 and v.status = #{status}
             </if>
-            <if test="subordinateBranch != null">
-                and v.subordinate_branch = #{subordinateBranch}
-            </if>
-            <if test="parkBranchCompanyId != null">
-                and v.park_branch_company_id = #{parkBranchCompanyId}
-            </if>
-            <if test="zoneId !=null">
-                and bc2.zone_id = #{zoneId}
+            <if test="companyIds != null and companyIds.size > 0">
+                and v.park_branch_company_id in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
             </if>
         </where>
     </select>