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

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";
 }

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

@@ -11,6 +11,7 @@ import lombok.Data;
 @Data
 public class BannerVo {
 
+    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-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,7 @@ import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -463,5 +468,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/inner/OrderCancelBiz.java

@@ -173,7 +173,7 @@ public class OrderCancelBiz {
 
                 //取消租车预定
                 //已支付,并且是待出行状态，取消预约
-                if(OrderStatusEnum.ORDER_TOSTART.equals(baseOrder.getStatus()) && SYS_TRUE.equals(baseOrder.getHasPay())){
+                if(OrderStatusEnum.ORDER_TOSTART.getCode().equals(baseOrder.getStatus()) && SYS_TRUE.equals(baseOrder.getHasPay())){
                     vehicleFeign.rentUnbookVehicle(orvd.getBookRecordId());
                 }else {
                     //未支付，拒绝之前的预约

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,21 @@ 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.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 +38,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 +62,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;
 
@@ -271,6 +293,37 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> changeVehicle(@RequestBody ChangeVehicleDTO dto) {
         checkAdminUser();
+        //根据订单号获取订单
+        //查询列表数据
+        Query query = baseOrderBiz.initQuery(dto.getNo());
+        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.getStartTime()), 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);
+        //如果成功则取消旧车的预约
+        vehicleFeign.rentUnbookVehicle(oldBookRecordId);
+        //设置新的vehicleId 和 record
+        orderRentVehicleBiz.updateSelectiveByIdRe(new OrderRentVehicleDetail(){{
+            setId(bo.getId());
+            setVehicleId(bo.getVehicleId());
+            setBookRecordId(bo.getBookRecordId());
+        }});
         return ObjectRestResponse.succ();
     }
 

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/service/OrderRentVehicleService.java

@@ -412,7 +412,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         vo.setCostDetail(result);
     }
 
-    private void acquireVehicle(RentVehicleBO detail) {
+    public void acquireVehicle(RentVehicleBO detail) {
         //根据车型、时间、距离，门店，预定车辆
         RentVehicleBookDTO rentVehicleBookDTO = BeanUtil.toBean(detail.getBookVehicleVO(), RentVehicleBookDTO.class);
         rentVehicleBookDTO.setModelId(detail.getModelId());
@@ -420,6 +420,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         rentVehicleBookDTO.setLiftCompany(detail.getStartCompanyId());
         rentVehicleBookDTO.setLiftAddr(detail.getStartAddr());
         rentVehicleBookDTO.setRetCompany(detail.getEndCompanyId());
+//        rentVehicleBookDTO.setOrderNo(detail.getO);
         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

@@ -19,10 +19,30 @@
  SELECT
         IFNULL(sum(gmv),0) as totalGmv
         FROM
+        (
+				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
+        (
+				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

@@ -147,10 +147,40 @@
         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-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/service/CertificationService.java

@@ -4,6 +4,7 @@ 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;
@@ -333,16 +334,17 @@ public class CertificationService {
             Example exa = new Example(IdInformation.class);
             Example.Criteria criteria = exa.createCriteria();
             criteria.andEqualTo("idNumber",idInformation.getIdNumber());
-            criteria.andEqualTo("userLoginId",idInformation.getUserLoginId());
-            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.getUserLoginId()+"----name====" + idInformation.getName()+"---IdNumber==="+idInformation.getIdNumber());
             //认证成功后修改用户,用户认证状态

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

@@ -16,6 +16,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,10 +46,16 @@ public class CustomerBehaviorNotesBiz extends BaseBiz<CustomerBehaviorNotesMappe
 
     private final ActivityBehaviorRelationBiz activityBehaviorRelationBiz;
 
+    @Value("${activity.register.id}")
+    private Integer activityId;
+
     public void saveCustomerBehavior(CustomerBehaviorNoteDTO customerBehaviorNoteDTO) {
         CustomerBehaviorNotes customerBehaviorNotes = new CustomerBehaviorNotes();
         BeanUtils.copyProperties(customerBehaviorNoteDTO, customerBehaviorNotes);
         customerBehaviorNotes.setCrtTime(Instant.now().toEpochMilli());
+        if (customerBehaviorNoteDTO.getType()==BehaviorEnum.REGISTRY.getCode()){
+            customerBehaviorNotes.setTypeId(activityId);
+        }
         mapper.insertSelective(customerBehaviorNotes);
     }
 

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

@@ -57,6 +57,9 @@ public class RentVehicleBookDTO extends PageParam {
     @ApiModelProperty("订单号")
     private String orderNo;
 
+    @ApiModelProperty("停靠公司id")
+    Integer parkBranchCompanyId;
+
     /**
      * 随车物品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-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;
@@ -152,17 +156,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();
+        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.andCondition(" addr_province = '" + addrProvince + "'");
+                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())) {

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

@@ -415,7 +415,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         checkIfVehicleExists(bookVehicleVo.getVehicleId());
         //提取日期和相应的预定目标日期
         Map<String,List<String>> yearMonthAndDate = Maps.newHashMap();
-        DateTime startDay =DateTime.parse(bookVehicleVo.getBookStartDate(),DATE_TIME_FORMATTER);
+        DateTime startDay =DateTime.parse(bookVehicleVo.getBookStartDate(), DATE_TIME_FORMATTER);
         DateTime endDay =DateTime.parse(bookVehicleVo.getBookEndDate(), DATE_TIME_FORMATTER);
         //转换日期范围为列表，并检查是否合法
         fillDateList4DatePeriod(yearMonthAndDate,startDay,endDay);
@@ -1097,8 +1097,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         List<String> notBookedDates = Lists.newArrayList();
         if(StringUtils.isNotBlank(dto.getStartDate())&&
                 StringUtils.isNotBlank(dto.getEndDate())) {
-            notBookedDates = convertDatePeriod2List(dto.getStartDate(),
-                    dto.getEndDate());
+            notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
+                    dto.getEndDateExtend());
         }
 
         //若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）

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

@@ -52,9 +52,9 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
     @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 +62,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)

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 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;
@@ -25,8 +26,14 @@ 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.DATE_TIME_LINE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP;
 import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP_NAME;
 
@@ -74,11 +81,12 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
      */
     @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);
+        return baseBiz.unbookVehicle4Employee(operatorId, bookRecordId, userName,null);
     }
 
     /**
@@ -89,6 +97,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
      */
     @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;
@@ -146,6 +155,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         //BaseContextHandler.getName();
         dto.setLimit(1);
         dto.setPage(1);
+        dto.setParkBranchCompanyId(dto.getLiftCompany());
         //查询可车辆信息
         PageDataVO<Vehicle> pageDataVO = vehicleBiz.searchUsableVehicle(dto);
         if (pageDataVO.getData().size() <= 0) {
@@ -153,12 +163,18 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
                 add("可用车辆不存在");
             }});
         }
+        //判断是否为今天，如果是则设置为一分钟后开始
+        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(pageDataVO.getData().get(0).getId());
-        bookVehicleVo.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
+        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/VehicleMapper.xml

@@ -640,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>
 
@@ -658,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