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

xx-activity/xx-activity-server/pom.xml

@@ -6,7 +6,6 @@
         <groupId>com.xxfc.common</groupId>
         <artifactId>xx-common-platform-web</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../../xx-common/xx-common-platform-web/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.xxfc.platform</groupId>

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

@@ -105,4 +105,9 @@ public class Banner {
      * 位置 banner位置0 所有 1：推荐 2：拍拍 3：短视频 4：问答
      */
     private Integer location;
+
+    /**
+     * 平台 0：APP 1：欣欣房车官网 2：滴房车官网
+     */
+    private Integer platform;
 }

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/feign/ConfigFeign.java

@@ -19,6 +19,9 @@ public interface ConfigFeign {
      */
     public static final int TYPE_CUS_SER = 400;
 
+    //旅游提前天数
+    public  static final int TYPE_TOUR_DAYS=99;
+
     @RequestMapping(value = "/cofig/app/unauth/types",method = RequestMethod.GET)
     ObjectRestResponse<List<Cofig>> getAllByType(@RequestParam("types") String types);
 

xx-app/xx-app-server/pom.xml

@@ -6,7 +6,6 @@
         <groupId>com.xxfc.common</groupId>
         <artifactId>xx-common-platform-web</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../../xx-common/xx-common-platform-web/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.xxfc.platform</groupId>

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

@@ -21,20 +21,9 @@ import java.util.List;
 @Service
 public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
 
-/*    @CacheClear(key = RedisKey.CONSTANT_CODE_PREFIX_BANNER)
-    public void update(Banner banner) {
-        this.updateSelectiveById(banner);
-    }
-
-
-    @CacheClear(key = RedisKey.CONSTANT_CODE_PREFIX_BANNER)
-    public void remove(int id) {
-        this.deleteById(id);
-    }*/
-
-    public List<BannerVo> findBannerList(Integer type,Integer location) {
+    public List<BannerVo> findBannerList(Integer type,Integer location,Integer platform) {
         List<BannerVo> bannerVos = new ArrayList<>();
-        List<Banner> banners = mapper.findBannerListByType(type,location);
+        List<Banner> banners = mapper.findBannerListByType(type,location,platform);
         banners.forEach(banner -> {
             BannerVo bannerVo = new BannerVo();
             bannerVo.setCover(banner.getCover());
@@ -46,30 +35,14 @@ public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
         return bannerVos;
     }
 
-/*
-    */
-/**
-     * 更改banner信息
-     * @param banner
-     * @param userInfo
-     * @return
-     *//*
-
-    public int update(Banner banner, UserDTO userInfo) {
-        banner.setUpdName(userInfo.getUsername());
-        banner.setUpdTime(Instant.now().toEpochMilli());
-        return  mapper.updateByPrimaryKeySelective(banner);
-    }
-*/
-
     /**
      * 分页查询banner
      * @param pageNo
      * @param pageSize
      * @return
      */
-    public PageDataVO<Banner> findBannePage(Integer pageNo, Integer pageSize) {
-        return  PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.findBannerListByisDelOrderByRank(Banner.builder().isDel(0).build()));
+    public PageDataVO<Banner> findBannePage(Integer pageNo, Integer pageSize,Integer platform) {
+        return  PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.findBannerListByisDelOrderByRank(Banner.builder().isDel(0).platform(platform).build()));
     }
 
     /**

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/mapper/BannerMapper.java

@@ -19,10 +19,10 @@ import java.util.List;
 @Repository
 public interface BannerMapper extends Mapper<Banner> {
 
-    @Select("select * from `banner` where is_del=#{isDel} order by rank ASC")
+    @Select("select * from `banner` where is_del=#{isDel} and `platform`=#{platform} order by rank ASC")
     List<Banner> findBannerListByisDelOrderByRank(Banner banner);
 
 
 
-    List<Banner> findBannerListByType(@Param("type") Integer type,@Param("location") Integer location);
+    List<Banner> findBannerListByType(@Param("type") Integer type,@Param("location") Integer location,@Param("platform") Integer platform);
 }

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/BannerController.java

@@ -21,19 +21,22 @@ import java.util.List;
 @RequestMapping("/banner")
 public class BannerController {
 
-     @Autowired
-     private BannerBiz bannerBiz;
+    @Autowired
+    private BannerBiz bannerBiz;
 
     /**
-     *查询banner图
+     * 查询banner图
+     *
      * @return
      */
     @GetMapping("/app/unauth/findBannerlist")
-    public ObjectRestResponse findBannerlist(@RequestParam("type") Integer type,@RequestParam(required = false,value = "location") Integer location){
-        if (type==null) {
+    public ObjectRestResponse findBannerlist(@RequestParam(value = "type") Integer type,
+                                             @RequestParam(required = false, value = "location") Integer location,
+                                             @RequestParam(value = "platform",required = false,defaultValue = "0") Integer platform) {
+        if (type == null) {
             return ObjectRestResponse.createDefaultFail();
         }
-        List<BannerVo> bannerList = bannerBiz.findBannerList(type,location);
-        return  ObjectRestResponse.succ(bannerList);
+        List<BannerVo> bannerList = bannerBiz.findBannerList(type, location,platform);
+        return ObjectRestResponse.succ(bannerList);
     }
 }

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/admin/BannerAdminController.java

@@ -21,22 +21,23 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/admin/banner")
-@Api(value = "banner后台接口",tags = "banner后台接口")
+@Api(value = "banner后台接口", tags = "banner后台接口")
 public class BannerAdminController {
 
-      @Autowired
-      private BannerBiz bannerBiz;
-    
+    @Autowired
+    private BannerBiz bannerBiz;
+
     /**
      * 修改
+     *
      * @param banner
      * @return
      */
     @PutMapping
-    @ApiOperation(value = "banner修改",notes = "修改")
-    public ObjectRestResponse<Banner> update(@RequestBody Banner banner, UserDTO userInfo){
-        int effectRows = bannerBiz.save(banner,userInfo);
-        if (effectRows>0){
+    @ApiOperation(value = "banner修改", notes = "修改")
+    public ObjectRestResponse<Banner> update(@RequestBody Banner banner, UserDTO userInfo) {
+        int effectRows = bannerBiz.save(banner, userInfo);
+        if (effectRows > 0) {
             return ObjectRestResponse.succ();
         }
         return ObjectRestResponse.createDefaultFail();
@@ -44,47 +45,51 @@ public class BannerAdminController {
 
     /**
      * 根据id查询banner
+     *
      * @param id
      * @return
      */
     @GetMapping("/{id}")
-    @ApiOperation(value = "根据id查询banner图",notes = "根据id查询banner图")
-    public ObjectRestResponse<Banner> findBannerById(@PathVariable Integer id){
+    @ApiOperation(value = "根据id查询banner图", notes = "根据id查询banner图")
+    public ObjectRestResponse<Banner> findBannerById(@PathVariable Integer id) {
         Banner Banner = bannerBiz.selectById(id);
         return ObjectRestResponse.succ(Banner);
     }
 
     /**
      * 分页查询banner
+     *
      * @param pageNo
      * @param pageSize
      * @return
      */
     @GetMapping("/page")
-    @ApiOperation(value = "banner分页查询",notes = "banner分页查询")
+    @ApiOperation(value = "banner分页查询", notes = "banner分页查询")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "pageNo",paramType = "query",required = false,dataType = "integer",defaultValue = "0"),
-            @ApiImplicitParam(name = "pageSize",paramType = "query",required = false,dataType = "integer",defaultValue = "10")
+            @ApiImplicitParam(name = "pageNo", paramType = "query", required = false, dataType = "integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "pageSize", paramType = "query", required = false, dataType = "integer", defaultValue = "10")
     })
-    public ObjectRestResponse<PageDataVO> findBannerPage(@RequestParam(name = "pageNo",defaultValue = "0",required = false) Integer pageNo,
-                                                             @RequestParam(name = "pageSize",defaultValue = "10",required = false) Integer pageSize){
+    public ObjectRestResponse<PageDataVO> findBannerPage(@RequestParam(name = "pageNo", defaultValue = "0", required = false) Integer pageNo,
+                                                         @RequestParam(name = "pageSize", defaultValue = "10", required = false) Integer pageSize,
+                                                         @RequestParam(name = "platform", defaultValue = "0", required = false) Integer platform) {
 
-        PageDataVO<Banner> pageDataVO = bannerBiz.findBannePage(pageNo,pageSize);
+        PageDataVO<Banner> pageDataVO = bannerBiz.findBannePage(pageNo, pageSize, platform);
 
         return ObjectRestResponse.succ(pageDataVO);
     }
 
     /**
      * 保存banner
+     *
      * @param banner
      * @return
      */
-    @ApiOperation(value = "banner保存",notes = "banner保存")
+    @ApiOperation(value = "banner保存", notes = "banner保存")
     @PostMapping
-    public ObjectRestResponse<Void> saveBanner(@RequestBody Banner banner,UserDTO userDTO){
+    public ObjectRestResponse<Void> saveBanner(@RequestBody Banner banner, UserDTO userDTO) {
         banner.setIsDel(0);
-        int effectRows = bannerBiz.save(banner,userDTO);
-        if (effectRows>0){
+        int effectRows = bannerBiz.save(banner, userDTO);
+        if (effectRows > 0) {
             return ObjectRestResponse.succ();
         }
         return ObjectRestResponse.createDefaultFail();
@@ -93,14 +98,15 @@ public class BannerAdminController {
 
     /**
      * 逻辑删除
+     *
      * @param id
      * @return
      */
     @DeleteMapping("/{id}")
-    @ApiOperation(value = "banner逻辑删除",notes = "banner逻辑删除")
-    public ObjectRestResponse<Void> deleteBannerById(@PathVariable Integer id,UserDTO userDTO){
-        int effectRows = bannerBiz.updateBannerStatus(id,1,userDTO);
-        if (effectRows>0){
+    @ApiOperation(value = "banner逻辑删除", notes = "banner逻辑删除")
+    public ObjectRestResponse<Void> deleteBannerById(@PathVariable Integer id, UserDTO userDTO) {
+        int effectRows = bannerBiz.updateBannerStatus(id, 1, userDTO);
+        if (effectRows > 0) {
             return ObjectRestResponse.succ();
         }
         return ObjectRestResponse.createDefaultFail();
@@ -108,11 +114,12 @@ public class BannerAdminController {
 
     /**
      * 真实删除
+     *
      * @param id
      * @return
      */
     @DeleteMapping("/del/{id}")
-    public ObjectRestResponse<Void> deleteReallyBannerById(@PathVariable(value = "id") Integer id){
+    public ObjectRestResponse<Void> deleteReallyBannerById(@PathVariable(value = "id") Integer id) {
         bannerBiz.deleteById(id);
         return ObjectRestResponse.succ();
     }

xx-app/xx-app-server/src/main/resources/mapper/BannerMapper.xml

@@ -15,6 +15,7 @@
         <result property="url" column="url"/>
         <result property="isDel" column="is_del"/>
         <result property="location" column="location"/>
+        <result property="platform" column="platform"/>
     </resultMap>
 
     <select id="findBannerListByType" resultMap="bannerMap">
@@ -22,6 +23,9 @@
         <if test="location != null">
             and `location`=#{location}
         </if>
+        <if test="platform != null">
+            and `platform`=#{platform}
+        </if>
         order by rank asc
     </select>
 </mapper>
\ No newline at end of file

xx-im/xx-im-server/pom.xml

@@ -6,7 +6,6 @@
         <artifactId>xx-common-platform-web</artifactId>
         <groupId>com.xxfc.common</groupId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../../xx-common/xx-common-platform-web/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -145,7 +145,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
         //扣減庫存
         ObjectRestResponse<TourSpePriceVo> response = tourFeign.stock(bo.getSpePriceId(), bo.getTotalNumber(), TourFeign.STOCK_SUBTRACT);
         if(!SYS_JSON_TRUE.equals(response.getStatus())) {
-            throw new BaseException(ResultCode.PARAM_EPIRE_CODE, Sets.newSet("库存不足"));
+            throw new BaseException(ResultCode.PARAM_EPIRE_CODE, Sets.newSet(response.getMessage()));
         }
 
 

xx-tour/xx-tour-server/pom.xml

@@ -18,6 +18,13 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.xxfc.platform</groupId>
+            <artifactId>xx-app-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodDetailBiz.java

@@ -4,6 +4,8 @@ import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.app.entity.Cofig;
+import com.xxfc.platform.app.feign.ConfigFeign;
 import com.xxfc.platform.tour.dto.GoodBannerDTO;
 import com.xxfc.platform.tour.dto.GoodTagDTO;
 import com.xxfc.platform.tour.entity.TourGood;
@@ -45,6 +47,8 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
     private UserFeign userFeign;
     @Autowired
     TourGoodBannerMapper bannerMapper;
+    @Autowired
+    ConfigFeign configFeign;
 
     //获取商品详情
     public ObjectRestResponse<TourGoodDetailVo> getGoodDetaileById(Integer id) {
@@ -79,7 +83,7 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
                 List<GoodBannerDTO> bannerList = bannerMapper.getBannerList(id);
                 detailVo.setBannerDTOS(bannerList);
                 //获取出行时间
-                List<TourDepartTimeVo> timelist = priceMapper.getAllByGoodId(id);
+                List<TourDepartTimeVo> timelist = priceMapper.getAllByGoodId(id,getTourDays());
                 detailVo.setTourDepartTimeVo(timelist);
                Integer stock=priceMapper.getTotalStock(id);
                 detailVo.setStock(stock);
@@ -109,7 +113,7 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
                 BeanUtils.copyProperties(detailVo, TourGood);
                 BigDecimal price = detailVo.getPrice();
                 //获取出行时间
-                List<TourDepartTimeVo> timelist = priceMapper.getAllByGoodId(id);
+                List<TourDepartTimeVo> timelist = priceMapper.getAllByGoodId(id,getTourDays());
                 detailVo.setTourDepartTimeVo(timelist);
                 //获取出发地点
                 List<TourDepartVo> departList = siteMapper.getlistByGoodId(id);
@@ -135,5 +139,19 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
         return  selectById(id);
     }
 
+    //获取旅游天数
+    public  Integer getTourDays(){
+        try {
+            List<Cofig> list=configFeign.getAllByType(ConfigFeign.TYPE_TOUR_DAYS+"").getData();
+            if (list!=null && list.size()>0){
+                String params=list.get(0).getValue();
+                return Integer.parseInt(params);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return  0;
+    }
+
 
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodSpeBiz.java

@@ -11,11 +11,13 @@ import com.xxfc.platform.tour.mapper.TourGoodSpePriceMapper;
 import com.xxfc.platform.tour.vo.TourSpePriceVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -30,6 +32,9 @@ import java.util.List;
 @Slf4j
 public class TourGoodSpeBiz extends BaseBiz<TourGoodSpePriceMapper, TourGoodSpePrice> {
 
+    @Autowired
+    TourGoodDetailBiz goodDetailBiz;
+
     public ObjectRestResponse<TourSpePriceVo> getPricesByuserid(TourSpePriceDTO priceDto) {
         if (priceDto == null || priceDto.getUserId() == null || priceDto.getUserId() == 0 ||
                 priceDto.getNumber() == null || priceDto.getNumber() == 0||priceDto.getSpeId()==null) {
@@ -89,6 +94,9 @@ public class TourGoodSpeBiz extends BaseBiz<TourGoodSpePriceMapper, TourGoodSpeP
            TourGoodSpePrice spePrice = mapper.selectByPrimaryKey(speId);
            if(type==1){
                if (spePrice != null && spePrice.getStock() > 0 && spePrice.getStock() >= number) {
+                    if (!checkTime(spePrice.getStartTime())){
+                        return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "该日期已超过系统限制");
+                    }
                    mapper.updStockById(speId, number,type);
                } else {
                    return ObjectRestResponse.createFailedResult(ResultCode.STOCK_CODE, "库存不足");
@@ -109,4 +117,25 @@ public class TourGoodSpeBiz extends BaseBiz<TourGoodSpePriceMapper, TourGoodSpeP
         TourGoodSpePrice spePrice = mapper.selectOne(tourGoodSpePrice);
         return spePrice.getStartTime();
     }
+
+    public  boolean checkTime(Date startTime){
+        try {
+            Date endTime=new Date();
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            long startDateTime = dateFormat.parse(dateFormat.format(startTime)).getTime();
+            long endDateTime = dateFormat.parse(dateFormat.format(endTime)).getTime();
+            if (startDateTime<=endDateTime){
+                return  false;
+            }
+            int days=(int)((startDateTime - endDateTime) / (1000 * 3600 * 24));
+            int tourDays=goodDetailBiz.getTourDays();
+            if (days>0&&days>=tourDays){
+                return  true;
+            }
+            return  false;
+        }catch (Exception e){
+            e.printStackTrace();
+            return false;
+        }
+    }
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodSpePriceMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface TourGoodSpePriceMapper extends Mapper<TourGoodSpePrice> {
 
-    List<TourDepartTimeVo>  getAllByGoodId(@Param("goodId") Integer goodId);
+    List<TourDepartTimeVo>  getAllByGoodId(@Param("goodId") Integer goodId,Integer days);
 
     //获取总库存
     Integer getTotalStock(@Param("goodId") Integer goodId);

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodSpeController.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.tour.rest;
 
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.tour.biz.TourGoodSpeBiz;
 import com.xxfc.platform.tour.common.TourBaseController;
 import com.xxfc.platform.tour.dto.TourSpePriceDTO;
@@ -31,7 +32,13 @@ public class TourGoodSpeController extends TourBaseController<TourGoodSpeBiz> {
             @RequestParam(value = "number",defaultValue = "0") Integer number,
             @RequestParam(value = "type",defaultValue = "1") Integer type
             ){
-        return   baseBiz.cutStock(speId,number,type);
+        try {
+            return   baseBiz.cutStock(speId,number,type);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"网络异常,稍后重试");
+        }
+
     }
 
     @GetMapping("/departure_date")

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodSpePriceMapper.xml

@@ -37,7 +37,7 @@
     <!-- 获取出行时间 -->
     <select id="getAllByGoodId"  resultMap="tourDepartTimeVoMap">
         SELECT id,good_id,DATE_FORMAT(start_time,'%Y-%m-%d') as start_time,DATE_FORMAT(end_time,'%Y-%m-%d') as end_time,spe_id,price,child_price,member_price,stock,
-        DATE_FORMAT(start_time,'%w') as startWeek,DATE_FORMAT(end_time,'%w') as endWeek,IF(IFNULL(DATEDIFF(start_time,NOW()),0)>0,'0','1') as overdue
+        DATE_FORMAT(start_time,'%w') as startWeek,DATE_FORMAT(end_time,'%w') as endWeek,IF(IFNULL(DATEDIFF(start_time,NOW()),0)>=#{days},'0','1') as overdue
         FROM tour_good_spe_price WHERE good_id=#{goodId} and is_del=0 ORDER BY start_time
     </select>
 

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/SummitActivityDTO.java

-package com.xxfc.platform.uccn.dto;
-
-import lombok.Data;
-
-/**
- * @author libin
- * @version 1.0
- * @description
- * @data 2019/8/26 15:51
- */
-@Data
-public class SummitActivityDTO {
-
-
-}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/entity/SummitActivity.java

@@ -202,6 +202,10 @@ public class SummitActivity implements Serializable {
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Long crtTime;
 
+    @Column(name = "upd_time")
+    @ApiModelProperty(value = "更新时间")
+    private Long updTime;
+
     /**
      * 活动对象说明（不展示）
      */

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityAdminVo.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @author libin
@@ -15,56 +16,110 @@ import java.io.Serializable;
 public class SummitActivityAdminVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
+
     private Integer id;
 
+
     @ApiModelProperty(value = "活动主标题")
     private String title;
 
+
+    @ApiModelProperty(value = "副标题（不展示）")
+    private String subtitle;
+
+
     @ApiModelProperty(value = "活动主图")
     private String banner;
 
     @ApiModelProperty(value = "开始时间")
     private Long startTime;
 
+
     @ApiModelProperty(value = "结束时间")
     private Long endTime;
 
+    @ApiModelProperty(value = "报名截止时间（不展示）")
+    private Long regCloseTime;
+
+
+    @ApiModelProperty(value = "省编码")
+    private Integer provinceCode;
+
+
     @ApiModelProperty(value = "省")
     private String province;
 
+    @ApiModelProperty(value = "市编码")
+    private Integer cityCode;
+
     @ApiModelProperty(value = "市")
     private String city;
 
+    @ApiModelProperty(value = "县/镇 编码")
+    private Integer townCode;
+
     @ApiModelProperty(value = "县/镇")
     private String town;
 
+
     @ApiModelProperty(value = "活动场地（地址格式）")
     private String address;
 
+    @ApiModelProperty(value = "纬度（不展示）")
+    private BigDecimal latitude;
+
+
+    @ApiModelProperty(value = "经度 （不展示）")
+    private BigDecimal longitude;
+
+
     @ApiModelProperty(value = "总人数")
     private Integer limitNum;
 
+
+    @ApiModelProperty(value = "活动图文内容")
+    private String content;
+
     @ApiModelProperty(value = "活动开关（0关，1开）")
     private Integer isShow;
 
+
     @ApiModelProperty(value = "报名开关（0开，1关）")
     private Integer isOpenReg;
 
+    @ApiModelProperty(value = "删除（0正常，1删除）")
+    private Integer isDel;
+
+
     @ApiModelProperty(value = "0是未发布，1是已发布")
     private Integer isPublish;
 
+
     @ApiModelProperty(value = "0是普通，1是置顶（首页展示）")
     private Integer isHomePage;
 
+
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Long crtTime;
 
+    @ApiModelProperty(value = "更新时间")
+    private Long updTime;
+
+
     @ApiModelProperty(value = "活动对象说明（不展示）")
     private String actDesc;
 
+
     @ApiModelProperty(value = "活动类型(保留，不展示)")
     private Integer type;
 
+
+    @ApiModelProperty(value = "报名人数（不展示）")
+    private Integer willNum;
+
+    @ApiModelProperty(value = "1:欣欣官网 2：滴房车官网 0：无限制")
+    private Integer location;
+
     @ApiModelProperty(value = "排序")
     private Integer rank;
 }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -3,9 +3,13 @@ package com.xxfc.platform.uccn.biz;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.util.RandomUtil;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.uccn.dto.SummitActivityFindDTO;
 import com.xxfc.platform.uccn.dto.SummitActivitySaveDTO;
+import com.xxfc.platform.uccn.entity.SummitActivity;
+import com.xxfc.platform.uccn.mapper.SummitActivityMapper;
 import com.xxfc.platform.uccn.vo.SummitActivityAdminVo;
 import com.xxfc.platform.uccn.vo.SummitActivityDetailVo;
 import com.xxfc.platform.uccn.vo.SummitActivityVo;
@@ -13,17 +17,10 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-
-import com.xxfc.platform.uccn.entity.SummitActivity;
-import com.xxfc.platform.uccn.mapper.SummitActivityMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 峰会活动
@@ -36,26 +33,28 @@ import java.util.Objects;
 public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActivity> {
 
 
-    public List<SummitActivityVo> findSummitActivityForHomePage(Integer limit) {
+    public List<SummitActivityVo> findSummitActivityForHomePage(Integer limit, Integer location) {
         Example example = new Example(SummitActivity.class);
         example.setOrderByClause("rank");
         Example.Criteria criteria = example.createCriteria();
         //未删除
-        criteria.andEqualTo("isDel",0);
+        criteria.andEqualTo("isDel", 0);
         //是首页展示
-        criteria.andEqualTo("isHomePage",1);
+        criteria.andEqualTo("isHomePage", 1);
         //已发布
-        criteria.andEqualTo("isPublish",1);
+        criteria.andEqualTo("isPublish", 1);
         //活动未下架
-        criteria.andEqualTo("isShow",0);
-        //结束时间大于当前时间
-        //criteria.andGreaterThanOrEqualTo("endTime", Instant.now().toEpochMilli());
+        criteria.andEqualTo("isShow", 1);
+        //位置
+        criteria.andIn("location", Arrays.asList(location, 0));
+
         PageDataVO<SummitActivity> dataVO = PageDataVO.pageInfo(1, limit, () -> mapper.selectByExample(example));
         List<SummitActivity> summitActivities = dataVO.getData();
-        if (CollectionUtils.isEmpty(summitActivities)){
+        if (CollectionUtils.isEmpty(summitActivities)) {
             return Collections.EMPTY_LIST;
         }
-        return JSON.parseObject(JSON.toJSONString(summitActivities),new TypeReference<List<SummitActivityVo>>(){});
+        return JSON.parseObject(JSON.toJSONString(summitActivities), new TypeReference<List<SummitActivityVo>>() {
+        });
     }
 
     public SummitActivityDetailVo findSummitActivityDetailById(Integer id) {
@@ -66,20 +65,18 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
     }
 
     public PageDataVO<SummitActivityAdminVo> listSummitActivityWithPage(SummitActivityFindDTO summitActivityFindDTO) {
-         PageDataVO<SummitActivityAdminVo> activityAdminVoPageDataVO = new PageDataVO<>();
-         Example example = new Example(SummitActivity.class);
-         example.setOrderByClause("crt_time");
+        PageDataVO<SummitActivityAdminVo> activityAdminVoPageDataVO = new PageDataVO<>();
+        Example example = new Example(SummitActivity.class);
+        example.setOrderByClause("crt_time");
         Example.Criteria criteria = example.createCriteria();
-        if (StringUtils.isNotEmpty(summitActivityFindDTO.getTitle())){
-            criteria.andLike("title",String.format("%%%s%%",summitActivityFindDTO.getTitle()));
+        if (StringUtils.isNotEmpty(summitActivityFindDTO.getTitle())) {
+            criteria.andLike("title", String.format("%%%s%%", summitActivityFindDTO.getTitle()));
         }
-        criteria.andEqualTo("isDel",0);
-       /* if (Objects.nonNull(summitActivityFindDTO.getStartTime()) && Objects.nonNull(summitActivityFindDTO.getEndTime())){
-            criteria.andBetween("")
-        }*/
-       PageDataVO<SummitActivity> pageDataVO = PageDataVO.pageInfo(summitActivityFindDTO.getPage(),summitActivityFindDTO.getLimit(),()->mapper.selectByExample(example));
+        criteria.andEqualTo("isDel", 0);
+
+        PageDataVO<SummitActivity> pageDataVO = PageDataVO.pageInfo(summitActivityFindDTO.getPage(), summitActivityFindDTO.getLimit(), () -> mapper.selectByExample(example));
         List<SummitActivity> data = pageDataVO.getData();
-        if (CollectionUtils.isEmpty(data)){
+        if (CollectionUtils.isEmpty(data)) {
             return activityAdminVoPageDataVO;
         }
 
@@ -87,7 +84,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         SummitActivityAdminVo summitActivityAdminVo;
         for (SummitActivity summitActivity : data) {
             summitActivityAdminVo = new SummitActivityAdminVo();
-            BeanUtils.copyProperties(summitActivity,summitActivityAdminVo);
+            BeanUtils.copyProperties(summitActivity, summitActivityAdminVo);
             summitActivityAdminVos.add(summitActivityAdminVo);
         }
         activityAdminVoPageDataVO.setTotalCount(pageDataVO.getTotalCount());
@@ -100,14 +97,15 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
 
     public void saveSummitActivity(SummitActivitySaveDTO summitActivitySaveDTO, UserDTO userDTO) {
         SummitActivity summitActivity = new SummitActivity();
-        if (Objects.isNull(summitActivitySaveDTO.getId())){
-            BeanUtils.copyProperties(summitActivitySaveDTO,summitActivity);
+        if (Objects.isNull(summitActivitySaveDTO.getId())) {
+            BeanUtils.copyProperties(summitActivitySaveDTO, summitActivity);
             summitActivity.setCrtName(userDTO.getUsername());
             summitActivity.setCrtUser(userDTO.getId());
             summitActivity.setCrtTime(Instant.now().toEpochMilli());
             mapper.insertSelective(summitActivity);
-        }else {
-            BeanUtils.copyProperties(summitActivitySaveDTO,summitActivity);
+        } else {
+            BeanUtils.copyProperties(summitActivitySaveDTO, summitActivity);
+            summitActivity.setUpdTime(Instant.now().toEpochMilli());
             mapper.updateByPrimaryKeySelective(summitActivity);
         }
     }
@@ -150,7 +148,62 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
     public SummitActivitySaveDTO selectSummitActivityById(Integer id) {
         SummitActivitySaveDTO summitActivitySaveDTO = new SummitActivitySaveDTO();
         SummitActivity summitActivity = mapper.selectByPrimaryKey(id);
-        BeanUtils.copyProperties(summitActivity,summitActivitySaveDTO);
+        BeanUtils.copyProperties(summitActivity, summitActivitySaveDTO);
         return summitActivitySaveDTO;
     }
+
+    /**
+     * 更改排序
+     *
+     * @param id
+     * @param rank
+     */
+    public void updateSummitActivityRankById(Integer id, Integer rank) {
+        SummitActivity summitActivity = new SummitActivity();
+        summitActivity.setId(id);
+        summitActivity.setRank(rank);
+        mapper.updateByPrimaryKeySelective(summitActivity);
+    }
+
+    public List<SummitActivityVo> getHostWithSummitActivity(Integer num, Integer location) {
+        List<SummitActivityVo> summitActivityVos = new ArrayList<>();
+        Example example = new Example(SummitActivity.class);
+        Example.Criteria criteria = example.createCriteria();
+        //未删除
+        criteria.andEqualTo("isDel", 0);
+        //已发布
+        criteria.andEqualTo("isPublish", 1);
+        //活动未下架
+        criteria.andEqualTo("isShow", 1);
+        //位置
+        criteria.andIn("location", Arrays.asList(location, 0));
+        criteria.andGreaterThan("endTime", Instant.now().toEpochMilli());
+
+        List<SummitActivity> summitActivities = mapper.selectByExample(example);
+
+        if (CollectionUtils.isNotEmpty(summitActivities)) {
+            SummitActivityVo summitActivityVo;
+            if (summitActivities.size() <= num) {
+                for (SummitActivity summitActivity : summitActivities) {
+                    summitActivityVo = new SummitActivityVo();
+                    summitActivityVo.setId(summitActivity.getId());
+                    summitActivityVo.setBanner(summitActivity.getBanner());
+                    summitActivityVo.setTitle(summitActivity.getTitle());
+                    summitActivityVos.add(summitActivityVo);
+                }
+            } else {
+                Set<Integer> resultSet = new HashSet<>();
+                RandomUtil.randomSet(summitActivities.size(), num, resultSet);
+                for (Integer i : resultSet) {
+                    summitActivityVo = new SummitActivityVo();
+                    SummitActivity summitActivity = summitActivities.get(i);
+                    summitActivityVo.setId(summitActivity.getId());
+                    summitActivityVo.setBanner(summitActivity.getBanner());
+                    summitActivityVo.setTitle(summitActivity.getTitle());
+                    summitActivityVos.add(summitActivityVo);
+                }
+            }
+        }
+        return summitActivityVos;
+    }
 }
\ No newline at end of file

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/SummitActivityController.java

@@ -28,9 +28,9 @@ public class SummitActivityController{
 
      @ApiOperation("官网首页展示")
      @GetMapping("/home")
-     public ObjectRestResponse<List<SummitActivityVo>>  findSummitActivityForHomePage(@RequestParam(defaultValue = "5",required = false) Integer limit){
+     public ObjectRestResponse<List<SummitActivityVo>>  findSummitActivityForHomePage(@RequestParam(defaultValue = "5",required = false) Integer limit,@RequestParam(value = "location",defaultValue = "1",required = false) Integer location){
 
-          List<SummitActivityVo> summitActivityVos = summitActivityBiz.findSummitActivityForHomePage(limit);
+          List<SummitActivityVo> summitActivityVos = summitActivityBiz.findSummitActivityForHomePage(limit,location);
           return ObjectRestResponse.succ(summitActivityVos);
      }
 
@@ -40,4 +40,12 @@ public class SummitActivityController{
            SummitActivityDetailVo summitActivityDetailVo = summitActivityBiz.findSummitActivityDetailById(id);
           return ObjectRestResponse.succ(summitActivityDetailVo);
      }
+
+     @ApiOperation("热门推荐获取")
+     @GetMapping("/hot")
+     public ObjectRestResponse<List<SummitActivityVo>> findHotWithSummitActivity(@RequestParam(value = "num",required = false,defaultValue = "2") Integer num,@RequestParam(value = "location",defaultValue = "1",required = false) Integer location){
+          List<SummitActivityVo> summitActivityVos = summitActivityBiz.getHostWithSummitActivity(num,location);
+          return ObjectRestResponse.succ(summitActivityVos);
+     }
+
 }
\ No newline at end of file

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/admin/SummitActivityAdminController.java

@@ -7,6 +7,7 @@ import com.xxfc.platform.uccn.biz.SummitActivityBiz;
 import com.xxfc.platform.uccn.dto.SummitActivityFindDTO;
 import com.xxfc.platform.uccn.dto.SummitActivitySaveDTO;
 import com.xxfc.platform.uccn.vo.SummitActivityAdminVo;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/admin/summitActivity")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@Api("峰会活动*后台")
 public class SummitActivityAdminController {
 
      private final  SummitActivityBiz summitActivityBiz;
@@ -75,6 +77,13 @@ public class SummitActivityAdminController {
           return ObjectRestResponse.succ();
      }
 
+     @ApiOperation("更改排序")
+     @PutMapping("/rank/{id}/{rank}")
+     public ObjectRestResponse<Void> setSummitActivityRank(@PathVariable(value = "id") Integer id,@PathVariable("rank") Integer rank){
+          summitActivityBiz.updateSummitActivityRankById(id,rank);
+          return ObjectRestResponse.succ();
+     }
+
      @ApiOperation("删除活动")
      @DeleteMapping("/{id}")
      public ObjectRestResponse<Void> deleteSummitActivity(@PathVariable(value = "id") Integer id){

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

@@ -127,7 +127,7 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         BigDecimal latitude=companyVo.getLatitude();
         BigDecimal longitude=companyVo.getLongitude();
         if (state==1&&(StringUtils.isBlank(companyVo.getAddrDetail())||StringUtils.isBlank(companyVo.getImages())||StringUtils.isBlank(companyVo.getDescribes())
-                ||StringUtils.isBlank(companyVo.getLeaderContactInfo())||latitude==null||longitude==null)){
+                ||latitude==null||longitude==null)){
             return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"上架时参数不能为空");
         }
         CompanyBase companyBase=new CompanyBase();

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

@@ -82,7 +82,7 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
-        if(MileageLift==null||MileageLift1>=MileageLift){
+        if(MileageLift==null||MileageLift1 >= MileageLift){
             // 写入车辆公里数,预计目的地
             vehicle.setMileageLastUpdate(MileageLift1);
             vehicle.setExpectDestinationBranchCompanyId(departureVo.getExpectArrivalBranchCompanyId());
@@ -103,38 +103,38 @@ public class VehicleActiveService {
                 updateBookRecordStatus(vehicleBookRecord, 1);
             }
             VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(departureVo.getBookRecordId());
-           if(vehicleDepartureLogVo != null) {
-               BeanUtil.copyProperties(departureVo, vehicleDepartureLogVo, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
-               VehicleDepartureLog departureLog = vehicleDepartureLogVo.getVehicleDeparture(vehicleDepartureLogVo);
-               departureLog.setDepartureTime(new Date());
-               departureLog.setUpdateTime(new Date());
-               departureLog.setState(VehicleDepartureState.DEPARTURE.getCode());
-               departureLog.setDepartureRemark(departureVo.getRemark());
-               if(vehicleBookRecord != null) {
-                   departureLog.setDepartureBranchCompanyId(vehicleBookRecord.getLiftCompany());
-                   departureLog.setUse(BookType.getByCode(vehicleBookRecord.getBookType()));
-                   departureLog.setUser(vehicleBookRecord.getVehicleUsername());
-                   departureLog.setUserTel(vehicleBookRecord.getVehicleUserPhone());
-               }
-               vehicleDepartureLogMapper.updateByPrimaryKeySelective(departureLog);
-           } else {
-               // 出车记录
-               VehicleDepartureLog departureLog = new VehicleDepartureLog();
-               BeanUtils.copyProperties(departureVo, departureLog);
-               departureLog.setDepartureTime(new Date());
-               departureLog.setCreateTime(new Date());
-               departureLog.setMileageStart(departureVo.getMileage());
-               departureLog.setState(VehicleDepartureState.DEPARTURE.getCode());
-               departureLog.setBookRecordId(departureVo.getBookRecordId());
-               departureLog.setDepartureRemark(departureVo.getRemark());
-               if(vehicleBookRecord != null) {
-                   departureLog.setDepartureBranchCompanyId(vehicleBookRecord.getLiftCompany());
-                   departureLog.setUse(BookType.getByCode(vehicleBookRecord.getBookType()));
-                   departureLog.setUser(vehicleBookRecord.getVehicleUsername());
-                   departureLog.setUserTel(vehicleBookRecord.getVehicleUserPhone());
-               }
-               vehicleDepartureLogMapper.insert(departureLog);
-           }
+            if(vehicleDepartureLogVo != null) {
+                BeanUtil.copyProperties(departureVo, vehicleDepartureLogVo, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+                VehicleDepartureLog departureLog = vehicleDepartureLogVo.getVehicleDeparture(vehicleDepartureLogVo);
+                departureLog.setDepartureTime(new Date());
+                departureLog.setUpdateTime(new Date());
+                departureLog.setState(VehicleDepartureState.DEPARTURE.getCode());
+                departureLog.setDepartureRemark(departureVo.getRemark());
+                if(vehicleBookRecord != null) {
+                    departureLog.setDepartureBranchCompanyId(vehicleBookRecord.getLiftCompany());
+                    departureLog.setUse(BookType.getByCode(vehicleBookRecord.getBookType()));
+                    departureLog.setUser(vehicleBookRecord.getVehicleUsername());
+                    departureLog.setUserTel(vehicleBookRecord.getVehicleUserPhone());
+                }
+                vehicleDepartureLogMapper.updateByPrimaryKeySelective(departureLog);
+            } else {
+                // 出车记录
+                VehicleDepartureLog departureLog = new VehicleDepartureLog();
+                BeanUtils.copyProperties(departureVo, departureLog);
+                departureLog.setDepartureTime(new Date());
+                departureLog.setCreateTime(new Date());
+                departureLog.setMileageStart(departureVo.getMileage());
+                departureLog.setState(VehicleDepartureState.DEPARTURE.getCode());
+                departureLog.setBookRecordId(departureVo.getBookRecordId());
+                departureLog.setDepartureRemark(departureVo.getRemark());
+                if(vehicleBookRecord != null) {
+                    departureLog.setDepartureBranchCompanyId(vehicleBookRecord.getLiftCompany());
+                    departureLog.setUse(BookType.getByCode(vehicleBookRecord.getBookType()));
+                    departureLog.setUser(vehicleBookRecord.getVehicleUsername());
+                    departureLog.setUserTel(vehicleBookRecord.getVehicleUserPhone());
+                }
+                vehicleDepartureLogMapper.insert(departureLog);
+            }
 
 
             // 车辆活动日志
@@ -170,13 +170,15 @@ public class VehicleActiveService {
                 stringBuilder.append("保养");
                 break;
         }
-            List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
-            if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
-                stringBuilder.append("中，使用人：");
-                stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
-                stringBuilder.append(" 使用人电话：");
-                stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
-            }
+        List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
+        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0 && vehicleBookRecordVos.get(0).getVehicleDepartureLogVo() != null && vehicleBookRecordVos.get(0).getVehicleDepartureLogVo().getState() != 1) {
+            stringBuilder.append("中，使用人：");
+            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
+            stringBuilder.append(" 使用人电话：");
+            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
+        } else {
+            stringBuilder.append("请联系管理员修改车辆状态为正常状态");
+        }
         return stringBuilder.toString();
     }
 
@@ -233,38 +235,39 @@ public class VehicleActiveService {
             }
             DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());
             DateTime actualArrivalDate = new DateTime(new Date());
-                if(actualArrivalDate.compareTo(arrivalDate) < 0) { //实际还车时间小于预计还车时间，需要释放后面的时间
-                    BookVehicleVO bookVehicleVo = new BookVehicleVO();
-                    BeanUtils.copyProperties(vehicleBookRecord, bookVehicleVo);
-                    bookVehicleVo.setNotCheckTimeLegal(Boolean.TRUE);
-                    bookVehicleVo.setBookStartDate(null);
-                    bookVehicleVo.setBookEndDate(null);
-                    bookVehicleVo.setUnbookStartDate(actualArrivalDate.toString(DATE_TIME_FORMATTER));
-                    bookVehicleVo.setUnbookEndDate(arrivalDate.toString(DATE_TIME_FORMATTER));
-                   try {
-                       Boolean hasSuc = vehicleBiz.unbookVehicle(bookVehicleVo);
-                       if(!hasSuc){
-                           throw new BaseException(ResCode.VEHICLE_UNBOOK_FAIL.getDesc(), ResCode.VEHICLE_UNBOOK_FAIL.getCode());
-                       }
-                   } catch ( Exception e) {
-                        e.printStackTrace();
-                   }
-                }
-                departureLog.setMileageEnd(arrivalVo.getMileage());
-                departureLog.setRecycleMan(arrivalVo.getRecycleMan());
-                departureLog.setRecycleManTel(arrivalVo.getRecycleManTel());
-                departureLog.setArrivalBranchCompanyId(arrivalVo.getArrivalBranchCompanyId());
-                departureLog.setUpdateTime(new Date());
-                departureLog.setArrivalTime(new Date());
-                departureLog.setState(VehicleDepartureState.END.getCode());
-                departureLog.setIllegalPic(arrivalVo.getIllegalPic());
-                departureLog.setIllegalAmount(arrivalVo.getIllegalAmount());
-                departureLog.setArrivalPic(arrivalVo.getArrivalPic());
-                departureLog.setArrivalRemark(arrivalVo.getRemark());
-                if(vehicleBookRecord != null) {
-                    departureLog.setArrivalBranchCompanyId(vehicleBookRecord.getRetCompany());
+            //提前还车处理
+            if(actualArrivalDate.compareTo(arrivalDate) < 0) { //实际还车时间小于预计还车时间，需要释放后面的时间
+                BookVehicleVO bookVehicleVo = new BookVehicleVO();
+                BeanUtils.copyProperties(vehicleBookRecord, bookVehicleVo);
+                bookVehicleVo.setNotCheckTimeLegal(Boolean.TRUE);
+                bookVehicleVo.setBookStartDate(null);
+                bookVehicleVo.setBookEndDate(null);
+                bookVehicleVo.setUnbookStartDate(actualArrivalDate.toString(DATE_TIME_FORMATTER));
+                bookVehicleVo.setUnbookEndDate(arrivalDate.toString(DATE_TIME_FORMATTER));
+                try {
+                    Boolean hasSuc = vehicleBiz.unbookVehicle(bookVehicleVo);
+                    if(!hasSuc){
+                        throw new BaseException(ResCode.VEHICLE_UNBOOK_FAIL.getDesc(), ResCode.VEHICLE_UNBOOK_FAIL.getCode());
+                    }
+                } catch ( Exception e) {
+                    e.printStackTrace();
                 }
-                vehicleDepartureLogMapper.updateByPrimaryKeySelective(departureLog);
+            }
+            departureLog.setMileageEnd(arrivalVo.getMileage());
+            departureLog.setRecycleMan(arrivalVo.getRecycleMan());
+            departureLog.setRecycleManTel(arrivalVo.getRecycleManTel());
+            departureLog.setArrivalBranchCompanyId(arrivalVo.getArrivalBranchCompanyId());
+            departureLog.setUpdateTime(new Date());
+            departureLog.setArrivalTime(new Date());
+            departureLog.setState(VehicleDepartureState.END.getCode());
+            departureLog.setIllegalPic(arrivalVo.getIllegalPic());
+            departureLog.setIllegalAmount(arrivalVo.getIllegalAmount());
+            departureLog.setArrivalPic(arrivalVo.getArrivalPic());
+            departureLog.setArrivalRemark(arrivalVo.getRemark());
+            if(vehicleBookRecord != null) {
+                departureLog.setArrivalBranchCompanyId(vehicleBookRecord.getRetCompany());
+            }
+            vehicleDepartureLogMapper.updateByPrimaryKeySelective(departureLog);
             // 车辆活动日志
             VehicleActiveLog activeLog = vehicleActiveLogMapper.selectLastByVehicleId(arrivalVo.getVehicleId());
             if (activeLog == null) {

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

@@ -816,11 +816,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 break;
         }
         List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
-        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
+        vehicleBookRecordBiz.removeStatus2(vehicleBookRecordVos);
+        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0 && vehicleBookRecordVos.get(0).getBookEndDate() != null && vehicleBookRecordVos.get(0).getBookEndDate().after(new Date())) {
             stringBuilder.append("中，使用人：");
             stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
             stringBuilder.append(" 使用人电话：");
             stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
+        } else {
+            stringBuilder.append("请联系管理员修改车辆状态为正常状态");
         }
         return stringBuilder.toString();
     }
@@ -1028,6 +1031,11 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         }
         if(MapUtils.isNotEmpty(yearMonthAndParam)){
             params.put("yearMonthAndParam",yearMonthAndParam);
+            String bitStr = "";
+            for(String key : yearMonthAndParam.keySet()) {
+                bitStr+= "1";
+            }
+            params.put("yearMonthAndParamBitStr", bitStr);
         }
     }
 

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

@@ -67,15 +67,15 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
         int endHour = new DateTime(endDate).hourOfDay().get();
         //获取开始天的预定小时
         int startPredictableHour = 0;
-            for (int curentHour = hour; curentHour <= 23; curentHour++) {
-                startPredictableHour |= 1 << (curentHour);
-            }
+        for (int curentHour = hour; curentHour <= 23; curentHour++) {
+            startPredictableHour |= 1 << (curentHour);
+        }
 
         //获取结束天的预定小时
         int endPredictableHour = 0;
-            for (int curentHour = 0; curentHour <= endHour; curentHour++) {
-                endPredictableHour |= 1 << (curentHour);
-            }
+        for (int curentHour = 0; curentHour <= endHour; curentHour++) {
+            endPredictableHour |= 1 << (curentHour);
+        }
         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(startPredictableHour == 0) { //如果是0点就直接预订全天
@@ -83,12 +83,12 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
         }
         if(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER).equals(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER))) {//同一天预定
             //如果开始时间是0点开始
-                predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour & endPredictableHour);
+            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);
         }
-        if(endDay.getMillis() - startDay.getMillis() > 24 * 3600 * 1000){ //
+        if(endDay.getMillis() - startDay.getMillis() > 24 * 3600 * 1000 ){ //
             for (DateTime curDate = startDay.plusDays(1); curDate.compareTo(endDay) < 0; curDate = curDate.plusDays(1)) {
                 String curDateStr = curDate.toString(DATE_TIME_FORMATTER);
                 //全天预定
@@ -145,15 +145,15 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     @Transactional
     @CacheClear(key = "vehicle.hourInfo")
     public ObjectRestResponse delete(String vehicleId, List<String> dateList) {
-            if(StringUtils.isBlank(vehicleId) || dateList.size() <= 0) {
-                return ObjectRestResponse.paramIsEmpty();
-            }
-            Map<String, Object> param = Maps.newHashMap();
-            param.put("vehicleId", vehicleId);
-            param.put("list", dateList);
-            List<VehicleBookHourInfo> list = mapper.selectByVehicleAndDateList(param);
-            list.forEach((a) -> mapper.delete(a));
-         return ObjectRestResponse.succ();
+        if(StringUtils.isBlank(vehicleId) || dateList.size() <= 0) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        Map<String, Object> param = Maps.newHashMap();
+        param.put("vehicleId", vehicleId);
+        param.put("list", dateList);
+        List<VehicleBookHourInfo> list = mapper.selectByVehicleAndDateList(param);
+        list.forEach((a) -> mapper.delete(a));
+        return ObjectRestResponse.succ();
     }
 
     public  ObjectRestResponse checkBookHourInfo() {

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

@@ -71,9 +71,10 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     private VehicleJobHandler vehicleJobHandler;
 
     @Autowired
-    BranchCompanyBiz branchCompanyBiz;
+    private VehicleBookHourInfoBiz vehicleBookHourInfoBiz;
+
     @Autowired
-    VehicleBookHourInfoBiz vehicleBookHourInfoBiz;
+    BranchCompanyBiz branchCompanyBiz;
 
     public UserFeign getUserFeign() {
         return userFeign;

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

@@ -344,7 +344,7 @@
     </select>
     <select id="selectByNumberPlate" resultType="com.xxfc.platform.vehicle.entity.Vehicle">
         select * from vehicle
-        where number_plate = #{numberPlate} and  is_del=0
+        where number_plate = #{numberPlate} and is_del=0
     </select>
 
     <select id="selectById" resultMap="searchModel">
@@ -523,16 +523,14 @@
         <!-- yearNo4Where 标识时间参数不用于where条件，用于select部分 -->
         <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
             ,(max(
-                <foreach collection="yearMonthAndParam" index="yearMonth" item="andOperation" separator="and">
-                    <include refid="yearMonthAndParamSql"></include>
-                </foreach>
+                vbi.bit_str = #{yearMonthAndParamBitStr}
                 <!-- 租车列表 不过滤前后预约记录不符的车辆 但是合并标示车型是否有车 即 hasVehicle-->
                 <if test="withoutRecordWhere != null and withoutRecordWhere = 1 and startCompanyId != null and endCompanyId != null ">
                     and (abr.to_lift_company is null or abr.to_lift_company = #{startCompanyId})
                     and (abr.to_return_company is null or abr.to_return_company = #{endCompanyId})
                 </if>
                 )
-            )as hasVehicle
+            ) as hasVehicle
         </if>
         <if test="lon != null and lat != null">
             ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
@@ -604,9 +602,9 @@
         <if test="lon != null and lat != null">
             ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
         </if>
-        <if test=" yearMonthAndParam !=null ">
-            ,ifnull(vbi.booked_date,0) as booked_date
-        </if>
+<!--        <if test=" yearMonthAndParam !=null ">-->
+<!--            ,ifnull(vbi.booked_date,0) as booked_date-->
+<!--        </if>-->
         <include refid="searchUsableSql"/>
         <if test="lon != null and lat != null">
             order by
@@ -618,8 +616,18 @@
     <sql id="searchUsableSql">
         from vehicle v
         <if test=" yearMonthAndParam !=null ">
-            left join
-            vehicle_book_info vbi on v.`id` = vbi.vehicle
+            left join (
+                select
+                    vbi.vehicle,
+                    BIT_OR(
+                       CONCAT(
+                           <foreach collection="yearMonthAndParam" index="yearMonth" item="andOperation" separator=",">
+                                <include refid="yearMonthAndParamSql"></include>
+                           </foreach>
+                       )
+                    ) as bit_str
+                from vehicle_book_info vbi group by vbi.vehicle
+            ) vbi on v.`id` = vbi.vehicle
         </if>
         left join vehicle_model vm on v.model_id = vm.id
         left join branch_company bc on v.park_branch_company_id = bc.id
@@ -634,11 +642,8 @@
         <where>
             <!-- 若需根据预定日期条件查询，针对换为位操作  -->
                 <!-- yearNo4Where 标识时间参数是否用于where条件 -->
-            <if test=" yearMonthAndParam !=null and yearNo4Where == null">
-                <foreach collection="yearMonthAndParam" index="yearMonth" item="andOperation">
-                and
-                    <include refid="yearMonthAndParamSql"></include>
-                </foreach>
+            <if test=" yearMonthAndParam !=null and yearMonthAndParam != null and yearNo4Where == null">
+                vbi.bit_str = #{yearMonthAndParamBitStr}
             </if>
 
             <!-- 根据前后record 过滤车辆  -->