Merge branch 'base-modify' into dev

.gitignore

@@ -7,6 +7,10 @@ target/
 .settings/
 .classpath
 ace-modules/ace-tool/src/main/resources/application-dev.yml
-**/logs
 **/src/test
+**/logs
+xx-order/xx-order-server/logs/**
+*.log
+logs/**
+/src/main/test/**
 

ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/GoodDataVO.java

@@ -37,4 +37,6 @@ public  class GoodDataVO{
     @ApiModelProperty(value = "纬度")
     private Double latitude;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

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

@@ -121,6 +121,9 @@ public class UserController extends CommonBaseController {
     @RequestMapping(value = "/front/menus", method = RequestMethod.GET)
     public @ResponseBody
     List<MenuTree> getMenusByUsername(String token,String state) throws Exception {
+        if (StringUtils.isBlank(state)){
+            state="0,1";
+        }
         return permissionService.getMenusByUsername(token,state);
     }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/PermissionService.java

@@ -177,7 +177,7 @@ public class PermissionService {
         }
         User user = userBiz.getUserByUsername(username);
         List<Menu> menus = menuBiz.getUserAuthorityMenuByUserId(user.getId());
-        menus=menus.stream().filter(a->state.contains(a.getState())).collect(Collectors.toList());
+        menus=menus.stream().filter(a->state.contains(a.getState()==null?"1":a.getState())).collect(Collectors.toList());
         return getMenuTree(menus,AdminCommonConstant.ROOT);
     }
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/feign/ActivityFeign.java

@@ -24,6 +24,8 @@ import java.util.List;
 @FeignClient(value = "xx-activity")
 public interface ActivityFeign {
 
+
+    public static final Integer TYPE_CHECK = 2;
     public static final Integer TYPE_USE = 1;
     public static final Integer TYPE_NO_USE = 0;
 

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

@@ -16,6 +16,7 @@ import com.xxfc.platform.activity.dto.UserCouponSendDTO;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.entity.IntegralUserTotal;
 import com.xxfc.platform.activity.entity.UserCoupon;
+import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.activity.vo.CouponVo;
 import com.xxfc.platform.activity.vo.UserCouponPageVo;
 import com.xxfc.platform.activity.vo.UserCouponVo;
@@ -289,7 +290,7 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         return  mapper.getUserCoupon(tickerNo);
     }
 
-    //支付后更新优惠卷状态:type.1-
+    //支付后更新优惠卷状态:type.1-触发使用优惠券；0-不触发优惠券使用（在优惠券未使用时）；2--不触发优惠券使用（不管优惠券是否已使用）
     public BigDecimal useTickerNo(Integer userId, List<String> tickerNos, String orderNo,Integer channel,BigDecimal amout,Integer type){
         BigDecimal couponAmout=new BigDecimal("0.00");
         if(couponAmout.compareTo(amout) >= 0) {
@@ -307,7 +308,8 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
             return couponAmout;
         }
         for (UserCoupon userCoupon:list) {
-            if(userCoupon!=null&&userCoupon.getIsUse()==1){
+            //zjw_0907 当type 为 check（即2）不判断 优惠券是否已使用
+            if(userCoupon!=null && userCoupon.getIsUse()==1 && !ActivityFeign.TYPE_CHECK.equals(type)){
                 log.error(userId+"----该优惠卷已使用--tickerNo==");
                 continue;
             }

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

@@ -110,4 +110,9 @@ public class Banner {
      * 平台 0：APP 1：欣欣房车官网 2：滴房车官网
      */
     private Integer platform;
+
+    /**
+     * html 标签悬浮显示  seo 需要
+     */
+    private String alt;
 }

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

@@ -23,4 +23,9 @@ public class BannerVo {
      * 跳转链接地址
      */
     private String url;
+
+    /**
+     * seo html标签优化
+     */
+    private String alt;
 }

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

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

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

@@ -165,4 +165,7 @@ public class CampsiteShopAdminDTO {
     @ApiModelProperty(value = "海报背景")
     private String posterBackground;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
+
 }

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

@@ -76,4 +76,8 @@ public class CampsiteShopDetailDTO {
     @ApiModelProperty(value = "海报背景")
     private String posterBackground;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
+
+
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/entity/CampsiteShop.java

@@ -213,4 +213,7 @@ public class CampsiteShop implements Serializable {
     @Column(name = "poster_background")
     @ApiModelProperty(value = "海报背景")
     private String posterBackground;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

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

@@ -172,4 +172,7 @@ public class CampsiteShopAdminVO {
 
     @ApiModelProperty(value = "海报背景")
     private String posterBackground;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

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

@@ -32,11 +32,12 @@
         <result property="isDel" column="is_del"/>
         <result property="hot" column="hot"/>
         <result property="saleState" column="sale_state"/>
+        <result property="alt" column="alt"/>
     </resultMap>
 
     <!--根据类型查询全部-->
     <select id="findAllCampsiteShopsByTypeOrCode" resultType="com.xxfc.platform.campsite.dto.CampsiteShopPageDTO">
-        select cs.id as `id`,cs.name as `name`,cs.logo as `logo`,cs.url as `url`,cs.province_name as `provinceName`,cs.city_name as `cityName`,cs.service_phone as `phone`,
+        select cs.id as `id`,cs.name as `name`,cs.logo as `logo`,cs.url as `url`,cs.province_name as `provinceName`,cs.city_name as `cityName`,cs.service_phone as `phone`,cs.alt
         cs.longitude as `longitude`,cs.latitude as `latitude`,`address` as `address`,cs.hot as `hot`,cs.crt_time as `crtTime`,cs.concat as `concat`,ct.id as `storeId`,ct.name as `storeTypeName`
         FROM `campsite_shop_tag`  cst
         left JOIN `campsite_shop` cs on cst.shop_id=cs.id
@@ -56,7 +57,7 @@
 
     <!--首页查询全部-->
     <select id="findAllByHome" resultType="com.github.wxiaoqi.security.common.vo.GoodDataVO">
-        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude
+        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude,cs.alt
         FROM `campsite_shop`  cs
         where cs.sale_state=1 and cs.is_del=0
         order  by cs.hot desc
@@ -64,7 +65,7 @@
     </select>
 
     <select id="findAll" resultType="com.github.wxiaoqi.security.common.vo.GoodDataVO">
-        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude
+        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude,cs.alt
         FROM `campsite_shop`  cs
         where cs.sale_state=1 and cs.is_del=0
         order  by cs.hot desc
@@ -73,7 +74,7 @@
     <!--根据id查询详情-->
     <select id="findCampsiteShopDetailById" resultType="com.xxfc.platform.campsite.dto.CampsiteShopDetailDTO">
         select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,`service_phone` as `phone`,`logo` as `logo`,`poster_background` as `posterBackground` ,
-        `content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude` from `campsite_shop` where `id`=#{id}
+        `content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude`,`alt` from `campsite_shop` where `id`=#{id}
     </select>
 
     <!--根据查询条件分页查询-->

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderViolateEnum.java

+package com.xxfc.platform.order.contant.enumerate;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrderViolateEnum {
+    BEFORE(1, "提前"),
+    AFTER(2, "延期")
+    ;
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    public static Map<Integer, OrderTypeEnum> codeAndDesc = new HashMap<Integer, OrderTypeEnum>();
+    //Maps.newHashMap();
+
+    static{
+        for(OrderTypeEnum enumE : OrderTypeEnum.values()){
+            codeAndDesc.put(enumE.getCode(), enumE);
+        }
+    }
+
+    OrderViolateEnum(Integer code, String desc){
+        this.code=code;
+        this.desc=desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public static Boolean exists(Integer code){
+        return codeAndDesc.containsKey(code);
+    }
+
+    public static OrderTypeEnum get(Integer code) {
+        for(OrderTypeEnum enumE : OrderTypeEnum.values()) {
+            if (enumE.getCode().equals(code)) {
+                return enumE;
+            }
+        }
+        return null;
+    }
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -3,9 +3,11 @@ package com.xxfc.platform.order.entity;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.assertj.core.util.Lists;
 import tk.mybatis.mapper.annotation.Version;
 
 
@@ -249,4 +251,32 @@ public class BaseOrder implements Serializable {
 	@ApiModelProperty(value = "下单时的会员等级")
 	@Column(name = "member_level")
 	private Integer memberLevel;
+
+	/**
+	 * 违约金
+	 */
+	@ApiModelProperty(value = "违约金")
+	@Column(name = "violate_amount")
+	BigDecimal ViolateAmount;
+
+	/**
+	 * 赔偿金
+	 */
+	@ApiModelProperty(value = "赔偿金")
+	@Column(name = "damages_amount")
+	BigDecimal damagesAmount;
+
+	/**
+	 * 额外费用
+	 */
+	@ApiModelProperty(value = "额外费用")
+	@Column(name = "extra_amount")
+	BigDecimal extraAmount;
+
+	/**
+	 * 返还的优惠券
+	 */
+	@ApiModelProperty(value = "返回的优惠券")
+	@Column(name = "back_coupon")
+	String backCoupon;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderRentVehicleDetail.java

@@ -308,4 +308,11 @@ public class OrderRentVehicleDetail implements Serializable {
 	@Column(name = "fixed_loss_status")
 	private Integer fixedLossStatus;
 
+	/**
+	 * 返还的免费天数
+	 */
+	@ApiModelProperty(value = "返回的免费天数")
+	@Column(name = "back_free_days")
+	Integer backFreeDays;
+
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderVehicleCrosstown.java

@@ -105,6 +105,13 @@ public class OrderVehicleCrosstown {
      */
     private String dedDetail;
 
+
+    /**
+     * 租车违约金明细
+     */
+    @Column(name = "violate_amount_detail")
+    private String violateDetail;
+
     /**
      *  1、交车， 2、还车, 3、定损还车
      */

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

+package com.xxfc.platform.order.pojo.calculate;
+
+import lombok.Data;
+import org.assertj.core.util.Lists;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class InProgressVO {
+    /**
+     * 违约金
+     */
+    BigDecimal ViolateAmount = BigDecimal.ZERO;
+
+    /**
+     * 赔偿金
+     */
+    BigDecimal damagesAmount = BigDecimal.ZERO;
+
+    /**
+     * 额外费用
+     */
+    BigDecimal extraAmount = BigDecimal.ZERO;
+
+    /**
+     * 返还的优惠券
+     */
+    List<String> backCoupons = Lists.newArrayList();
+
+    /**
+     * 返还的免费天数
+     */
+    Integer backFreeDays = 0;
+}

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

+package com.xxfc.platform.order.biz.inner;
+
+import cn.hutool.core.date.DateUtil;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.activity.entity.Coupon;
+import com.xxfc.platform.activity.feign.ActivityFeign;
+import com.xxfc.platform.app.entity.Cofig;
+import com.xxfc.platform.app.feign.ConfigFeign;
+import com.xxfc.platform.order.biz.OrderItemBiz;
+import com.xxfc.platform.order.biz.OrderRefundBiz;
+import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
+import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
+import com.xxfc.platform.order.entity.*;
+import com.xxfc.platform.order.pojo.calculate.InProgressVO;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.dto.SmsTemplateDTO;
+import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.feign.ThirdFeign;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.CompanyDetail;
+import lombok.extern.slf4j.Slf4j;
+import org.assertj.core.util.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.HOUR_MINUTE_FORMATTE_HUTOOL;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
+
+/**
+ * 订单退款记录表
+ *
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-18 11:08:09
+ */
+@Slf4j
+@Service
+public class OrderCalculateBiz {
+
+    @Autowired
+    UserFeign userFeign;
+
+    @Autowired
+    ThirdFeign thirdFeign;
+
+    @Autowired
+    VehicleFeign vehicleFeign;
+
+    @Autowired
+    ConfigFeign configFeign;
+
+    @Autowired
+    ActivityFeign activityFeign;
+
+    @Autowired
+    OrderRefundBiz orderRefundBiz;
+
+    @Autowired
+    OrderItemBiz orderItemBiz;
+
+    public InProgressVO inProgressCalculate(BaseOrder baseOrder, OrderItem orderItem, Integer freeDays, Integer useDays) {
+        //计算：剩余免费天数
+        Integer backFreeDays = freeDays - useDays;
+        //过了出发时间取消订单 ，优先使用免费天数
+        if(backFreeDays <= 0) {
+            //大于总天数 只返回押金
+            if(useDays >= orderItem.getTotalNum()) {
+                //退押金
+                //orderRefundBiz.rentRefundDepositProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, freeDayAmount);
+            }else {
+                //需要扣除订单费用
+                //判断是否达到优惠券条件 不符合则返还优惠券
+                Integer consumeDays = 0 - backFreeDays;
+                //计算使用天数的费用
+                BigDecimal consumeAmount = orderItem.getUnitPrice().multiply(new BigDecimal(consumeDays+""));
+                List<String> backCouponNos = Lists.newArrayList();
+                List<BigDecimal> couponAmounts = Lists.newArrayList();
+                for(String tickerNo : baseOrder.getCouponTickerNos().split(",")) {
+                    BigDecimal couponAmount = activityFeign.use(baseOrder.getUserId(), Lists.newArrayList(tickerNo), baseOrder.getNo(), Coupon.CHANNEL_RENT, consumeAmount, ActivityFeign.TYPE_CHECK);
+                    if(couponAmount.compareTo(BigDecimal.ZERO) > 0) {
+                        //能够使用优惠券，则不返还
+                        couponAmounts.add(couponAmount);
+                    } else {
+                        backCouponNos.add(tickerNo);
+                    }
+                }
+            }
+        }else {
+            //返回剩余免费天数，返回优惠券，订单款
+
+
+        }
+
+        return new InProgressVO();
+    }
+
+    public InProgressVO inProgressCalculate(BaseOrder baseOrder, Integer useDays) {
+        OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
+            setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+            setOrderId(baseOrder.getId());
+        }});
+        Integer freeDays = (null == orderItem.getCutNum())?0 :orderItem.getCutNum();
+        return inProgressCalculate(baseOrder, orderItem, freeDays, useDays);
+    }
+}
\ No newline at end of file

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

@@ -4,15 +4,19 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.activity.entity.Coupon;
+import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.*;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
+import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
+import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,6 +59,9 @@ public class OrderCancelBiz {
     @Autowired
     OrderMsgBiz orderMsgBiz;
 
+    @Autowired
+    OrderCalculateBiz orderCalculateBiz;
+
     @Autowired
     UserFeign userFeign;
 
@@ -67,6 +74,9 @@ public class OrderCancelBiz {
     @Autowired
     ThirdFeign thirdFeign;
 
+    @Autowired
+    ActivityFeign activityFeign;
+
     private static Map<Integer, List<Integer>> cancelAble;
     static {
         cancelAble = new HashMap<Integer, List<Integer>>();
@@ -110,28 +120,41 @@ public class OrderCancelBiz {
                         setOrderId(baseOrder.getId());
                     }});
 
-                    //原退还押金
-                    BigDecimal freeDayAmount = BigDecimal.ZERO;
-                    //判断是否使用免费天数，并且进行扣款
-                    if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
                     OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
                         setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
                         setOrderId(baseOrder.getId());
                     }});
-                        freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
-                    }
+
+                    //原退还押金
+                    Integer freeDays = (null == orderItem.getCutNum())?0 :orderItem.getCutNum();
+                    BigDecimal freeDayAmount = BigDecimal.ZERO;
 
 
                     //如果超过出发时间，不能取消订单
                     //根据时间处理goodsAmount
                     //获取出发时间 到现在 距离时间
                     Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
-                    //后面允许开始时间过后可以取消订单
-//                    if(timeLag < 0) {
-//                        throw new BaseException(ResultCode.FAILED_CODE, new HashSet<String>(){{
-//                            add("已超过出发时间，不能取消订单");
-//                        }});
-//                    }
+                    if(timeLag < 0 ) {
+                        //计算：使用天数 当前时间 - 开始时间的0时0分0秒
+                        Long useTimeLag = System.currentTimeMillis() - orvd.getStartTime();
+                        Integer useDays = new BigDecimal(useTimeLag + "").divide(new BigDecimal((24 * 60 * 60 * 1000)+ "")).setScale(0, BigDecimal.ROUND_UP).intValue();
+                        orderCalculateBiz.inProgressCalculate(baseOrder, orderItem, freeDays, useDays);
+
+                    }else {
+                        //没到出车时间
+                        //判断是否使用免费天数，并且进行扣款
+                        if(freeDays > 0) {
+                            freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
+
+                            //违约金封顶 租车身份价 * 2天
+                            BigDecimal topAmount = orderItem.getUnitPrice().multiply(new BigDecimal("2"));
+                            if(freeDayAmount.compareTo(topAmount) > 0) {
+                                freeDayAmount = freeDayAmount;
+                            }
+                        }
+                    }
+
+
 
                     //退款流程
                         //退订单款

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/TourGoodDTO.java

@@ -112,4 +112,7 @@ public class TourGoodDTO {
 	@ApiModelProperty(value = "海报背景")
 	private String posterBackground;
 
+	@ApiModelProperty("seo*html标签优化")
+	private String alt;
+
 }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGood.java

@@ -134,4 +134,7 @@ public class TourGood implements Serializable {
 	@Column(name = "poster_background")
 	@ApiModelProperty(value = "海报背景")
 	private String posterBackground;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String alt;
 }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodDetailVo.java

@@ -130,5 +130,7 @@ public class TourGoodDetailVo {
 
    private String posterBackground;
 
+	@ApiModelProperty("seo*html标签优化")
+	private String alt;
 
 }

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

+package com.xxfc.platform.uccn.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:47
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class FriendLinkDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+    /**
+     * 连接地址
+     */
+    private String linkUrl;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 简要说明
+     */
+    private String brief;
+    /**
+     * 排序
+     */
+    private Integer rank;
+    /**
+     * 创建者id
+     */
+    private Integer crtUser;
+    /**
+     * 上架状态  上架：true 下架：false
+     */
+    private Boolean onState;
+    /**
+     * 平台 1：欣新房车官网 2：滴房车官网 0：无限制
+     */
+    private Integer platform;
+}

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

+package com.xxfc.platform.uccn.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 12:05
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class FriendLinkFindDTO extends PageParam {
+
+    private String  name;
+
+    private Boolean onState;
+}

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

+package com.xxfc.platform.uccn.dto;
+
+import com.xxfc.platform.uccn.entity.Model;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+public class ModelDto {
+    private Model parent;
+    private List<Model> list;
+
+    public ModelDto(Model parent, List<Model> list) {
+        this.parent = parent;
+        this.list = list;
+    }
+}

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

+package com.xxfc.platform.uccn.dto;
+
+import com.xxfc.platform.uccn.entity.SEO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+@Data
+@Api
+public class SeoDTO extends SEO {
+
+    @Column(name = "modeName")
+    @ApiModelProperty(value = "模块名称")
+    private String modelName;
+
+    @Column(name = "model_id")
+    @ApiModelProperty(value = "模块id")
+    private Integer modelId;
+}

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

@@ -103,4 +103,7 @@ public class SummitActivitySaveDTO implements Serializable {
 
     @ApiModelProperty(value = "排序")
     private Integer rank;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

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

@@ -3,14 +3,12 @@ package com.xxfc.platform.uccn.entity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import tk.mybatis.mapper.annotation.KeySql;
 import tk.mybatis.mapper.code.IdentityDialect;
 
 import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.util.Date;
@@ -139,4 +137,6 @@ public class Article {
     @ApiModelProperty(value = "上架时间")
     private Date addTime;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

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

+package com.xxfc.platform.uccn.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 友情连接
+ * @data 2019/9/6 10:40
+ */
+
+@Data
+@Entity
+@Table(name = "friend_link")
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+
+public class FriendLink implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Long id;
+    /**
+     * 连接地址
+     */
+    @Column(name = "link_url")
+    private String linkUrl;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 简要说明
+     */
+    private String brief;
+    /**
+     * 排序
+     */
+    private Integer rank;
+    /**
+     * 创建时间
+     */
+    @Column(name = "crt_time")
+    private Long crtTime;
+    /**
+     * 更新时间
+     */
+    @Column(name = "upd_time")
+    private Long updTime;
+    /**
+     * 发布时间
+     */
+    @Column(name = "publish_time")
+    private Long publishTime;
+    /**
+     * 删除状态 true：正常 1：删除
+     */
+    @Column(name = "is_del")
+    private Boolean isDel;
+    /**
+     * 创建者id
+     */
+    @Column(name = "crt_user")
+    private Integer crtUser;
+    /**
+     * 上架状态  上架：true 下架：false
+     */
+    @Column(name = "on_state")
+    private Boolean onState;
+    /**
+     * 平台 1：欣新房车官网 2：滴房车官网 0:无限制
+     */
+    private Integer platform;
+}

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

+package com.xxfc.platform.uccn.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javafx.scene.input.Mnemonic;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Table(name = "model")
+@ApiModel(value = "官网模块实体")
+@NoArgsConstructor
+public class Model implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+
+    @Column(name = "parent_id")
+    @ApiModelProperty(value = "父模块id")
+    private Integer parentId;
+
+    @Column(name = "name")
+    @ApiModelProperty(value = "模块名称")
+    private String name;
+
+    @Column(name = "level")
+    @ApiModelProperty(value = "模块等级")
+    private Integer level;
+
+    @Column(name = "cre_time")
+    @ApiModelProperty(value = " 创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creTime;
+
+    @Column(name = "upd_time")
+    @ApiModelProperty(value = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updTime;
+
+    @Column(name = "is_del")
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDel;
+
+    @Column(name = "rank")
+    @ApiModelProperty(value = "排序")
+    private Integer rank;
+
+    public Model(Integer id) {
+        this.id = id;
+    }
+}

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

+package com.xxfc.platform.uccn.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Data
+@Table(name = "seo")
+@ApiModel(value = "seo列表实体")
+@NoArgsConstructor
+public class SEO {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+
+
+    @Column(name = "model_id")
+    @ApiModelProperty(value = "模块id")
+    private Integer modelId;
+
+    @Column(name = "title")
+    @ApiModelProperty(value = "title内容")
+    private String title;
+
+    @Column(name = "keywords")
+    @ApiModelProperty(value = "关键子")
+    private String keywords;
+
+    @Column(name = "description")
+    @ApiModelProperty(value = "description内容")
+    private String description;
+
+    @Column(name = "header")
+    @ApiModelProperty(value = "标题")
+    private String header;
+
+
+    @Column(name = "cre_time")
+    @ApiModelProperty(value = " 创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creTime;
+
+    @Column(name = "upd_time")
+    @ApiModelProperty(value = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updTime;
+
+}

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

@@ -241,4 +241,7 @@ public class SummitActivity implements Serializable {
     @ApiModelProperty(value = "排序")
     private Integer rank;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
+
 }

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

+package com.xxfc.platform.uccn.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:53
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class FriendLinkAdminVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+    /**
+     * 连接地址
+     */
+    private String linkUrl;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 简要说明
+     */
+    private String brief;
+    /**
+     * 排序
+     */
+    private Integer rank;
+    /**
+     * 创建时间
+     */
+    private Long crtTime;
+    /**
+     * 发布时间
+     */
+    private Long publishTime;
+    /**
+     * 创建者id
+     */
+    private Integer crtUser;
+    /**
+     * 上架状态  上架：true 下架：false
+     */
+    private Boolean onState;
+    /**
+     * 平台 1：欣新房车官网 2：滴房车官网 0：无限制
+     */
+    private Integer platform;
+}

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

+package com.xxfc.platform.uccn.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:51
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class FriendLinkVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 连接地址
+     */
+    private String linkUrl;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 简要说明
+     */
+    private String brief;
+
+}

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

+package com.xxfc.platform.uccn.vo;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class ModelQuery {
+    private Integer page  = 1;
+    private Integer limit = 10;
+}

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

+package com.xxfc.platform.uccn.vo;
+
+import com.xxfc.platform.uccn.entity.Model;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ModelVo {
+    private Integer parentId;
+    private List<Model> list;
+}

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

+package com.xxfc.platform.uccn.vo;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class SEOQuery {
+    private Integer page  = 1;
+    private Integer limit = 10;
+}

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

+package com.xxfc.platform.uccn.vo;
+
+import com.xxfc.platform.uccn.entity.SEO;
+import lombok.Data;
+
+@Data
+public class SEOVo extends SEO {
+
+}

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

@@ -122,4 +122,7 @@ public class SummitActivityAdminVo implements Serializable {
 
     @ApiModelProperty(value = "排序")
     private Integer rank;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

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

@@ -83,4 +83,6 @@ public class SummitActivityDetailVo implements Serializable {
     @JsonIgnore
     private Integer willNum;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

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

@@ -58,4 +58,7 @@ public class SummitActivityVo implements Serializable {
     @ApiModelProperty(value = "排序")
     @JsonIgnore
     private Integer rank;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

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

 package com.xxfc.platform.uccn.vo;
 
-import lombok.Data;
-
 public enum TypeEnum {
     VEHICLE(1, "车型"),
     TOUR(2, "旅游"),

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

+package com.xxfc.platform.uccn.biz;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.uccn.dto.FriendLinkDTO;
+import com.xxfc.platform.uccn.dto.FriendLinkFindDTO;
+import com.xxfc.platform.uccn.entity.FriendLink;
+import com.xxfc.platform.uccn.mapper.FriendLinkMapper;
+import com.xxfc.platform.uccn.vo.FriendLinkAdminVO;
+import com.xxfc.platform.uccn.vo.FriendLinkVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import tk.mybatis.mapper.entity.Example;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:57
+ */
+@Service
+public class FriendLinkBiz extends BaseBiz<FriendLinkMapper, FriendLink> {
+
+    /**
+     * 保存编辑
+     * @param friendLinkDTO
+     */
+    public void saveFriendLink(FriendLinkDTO friendLinkDTO) {
+        FriendLink friendLink = new FriendLink();
+        BeanUtils.copyProperties(friendLinkDTO, friendLink);
+        if (friendLink.getOnState()){
+            friendLink.setPublishTime(Instant.now().toEpochMilli());
+        }
+        if (Objects.isNull(friendLinkDTO.getId())) {
+            friendLink.setCrtTime(Instant.now().toEpochMilli());
+            friendLink.setIsDel(false);
+            mapper.insertSelective(friendLink);
+        }else {
+            friendLink.setUpdTime(Instant.now().toEpochMilli());
+            mapper.updateByPrimaryKeySelective(friendLink);
+        }
+    }
+
+    /**
+     * 上下架
+     * @param id
+     */
+    public void  updateFriendLinkOnStateById(Long id,Boolean onState){
+        FriendLink friendLink = FriendLink.builder().id(id).onState(onState).updTime(Instant.now().toEpochMilli()).build();
+        if (onState){
+            friendLink.setPublishTime(Instant.now().toEpochMilli());
+        }
+        mapper.updateByPrimaryKeySelective(friendLink);
+    }
+
+    /**
+     * 删除
+     * @param id
+     */
+    public void deleteFriendLinkById(Long id){
+        FriendLink friendLink = FriendLink.builder().id(id).updTime(Instant.now().toEpochMilli()).isDel(true).build();
+        mapper.updateByPrimaryKeySelective(friendLink);
+    }
+
+    /**
+     * 根据id查询
+     * @param id
+     * @return
+     */
+    public FriendLinkDTO findFriendLinkById(Long id){
+        FriendLinkDTO friendLinkDTO = FriendLinkDTO.builder().build();
+        FriendLink friendLink = mapper.selectByPrimaryKey(id);
+        if (Objects.isNull(friendLink)){
+            return friendLinkDTO;
+        }
+        BeanUtils.copyProperties(friendLink,friendLinkDTO);
+        return friendLinkDTO;
+    }
+
+
+    public List<FriendLinkVO> listFriendLinkByPlatform(Integer platform){
+        List<FriendLinkVO> friendLinkVOS = new ArrayList<>();
+        Example example = new Example(FriendLink.class);
+        example.setOrderByClause("rank DESC,publish_time DESC");
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("isDel",0);
+        criteria.andEqualTo("onState",true);
+        criteria.andIn("platform", Arrays.asList(platform,0));
+        criteria.andNotEqualTo("linkUrl","");
+        List<FriendLink> friendLinks = mapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(friendLinks)){
+            return friendLinkVOS;
+        }
+        friendLinkVOS = JSON.parseObject(JSON.toJSONString(friendLinks), new TypeReference<List<FriendLinkVO>>() {
+        });
+        return friendLinkVOS;
+    }
+
+    public PageDataVO<FriendLinkAdminVO> listFriendLinkWithPage(FriendLinkFindDTO friendLinkFindDTO){
+        PageDataVO<FriendLinkAdminVO> pageDataVO = new PageDataVO<>();
+        Example example = new Example(FriendLink.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("isDel",0);
+        if (!StringUtils.isEmpty(friendLinkFindDTO.getName())){
+            criteria.andLike("name",String.format("%%%s%%",friendLinkFindDTO.getName().trim()));
+        }
+        if (Objects.nonNull(friendLinkFindDTO.getOnState())){
+            criteria.andEqualTo("onState",friendLinkFindDTO.getOnState());
+        }
+        PageDataVO<FriendLink> friendLinkPageDataVO = PageDataVO.pageInfo(friendLinkFindDTO.getPage(),friendLinkFindDTO.getLimit(),()->mapper.selectByExample(example));
+        List<FriendLink> data = friendLinkPageDataVO.getData();
+        if (CollectionUtils.isEmpty(data)){
+            return pageDataVO;
+        }
+
+        List<FriendLinkAdminVO> friendLinkAdminVOS = new ArrayList<>();
+        FriendLinkAdminVO friendLinkAdminVO;
+        for (FriendLink friendLink : data) {
+             friendLinkAdminVO = new FriendLinkAdminVO();
+            BeanUtils.copyProperties(friendLink,friendLinkAdminVO);
+            friendLinkAdminVOS.add(friendLinkAdminVO);
+        }
+        pageDataVO.setData(friendLinkAdminVOS);
+        pageDataVO.setPageSize(friendLinkPageDataVO.getPageSize());
+        pageDataVO.setPageNum(friendLinkPageDataVO.getPageNum());
+        pageDataVO.setTotalPage(friendLinkPageDataVO.getTotalPage());
+        pageDataVO.setTotalCount(friendLinkPageDataVO.getTotalCount());
+
+        return pageDataVO;
+    }
+}

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

+package com.xxfc.platform.uccn.biz;
+
+import com.ace.cache.annotation.Cache;
+import com.ace.cache.annotation.CacheClear;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.uccn.dto.ModelDto;
+import com.xxfc.platform.uccn.entity.Model;
+import com.xxfc.platform.uccn.vo.ModelVo;
+import com.xxfc.platform.uccn.mapper.ModelBackgroundMapper;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
+
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class ModelBackgroundBiz extends BaseBiz<ModelBackgroundMapper, Model> {
+    private final Integer BASE_PARENT_ID = 0;
+
+    private final Integer NOT_DELETE = 0;
+
+    private final Integer level=2;
+
+    @Autowired
+    private ApplicationContext context;
+
+    public List<ModelDto> getList() {
+        List<Model> ModelList = getProxy().getListByParentId(BASE_PARENT_ID);
+        if (CollectionUtils.isEmpty(ModelList)) {
+            return new ArrayList<>();
+        }
+        return getModelDtos(ModelList);
+    }
+
+    /**
+     * 获取ModelDto集合
+     * @param models
+     * @return
+     */
+    private ArrayList<ModelDto> getModelDtos(List<Model> models) {
+        ArrayList<ModelDto> modelDtos = new ArrayList<>();
+        for (Model el : models) {
+            if (el.getLevel()==3) {
+                break;
+            }
+            List<Model> list = getListByParentId(el.getId());
+            modelDtos.add(new ModelDto(el, list));
+            modelDtos.addAll(getModelDtos(list));
+        }
+        return modelDtos;
+    }
+
+    /**
+     * 根据父类id获取所有子类集合
+     *
+     * @param parentId
+     * @return
+     */
+//    @Cache(key = "ModelList{1}")
+    public List<Model> getListByParentId(Integer parentId) {
+        Example exa  = new Example(Model.class);
+        Example.Criteria criteria = exa.createCriteria();
+        criteria.andEqualTo("parentId",parentId).andEqualTo("isDel",NOT_DELETE);
+        exa.orderBy("rank").asc();
+        return mapper.selectByExample(exa);
+    }
+
+    /**
+     * 获取代理对象
+     *
+     * @return
+     */
+    private ModelBackgroundBiz getProxy() {
+        return context.getBean(ModelBackgroundBiz.class);
+    }
+
+
+    /**
+     * 修改子模块
+     *
+     * @param Modelvo
+     * @return
+     */
+//    @CacheClear(key = "ModelList{1.Integer}")
+    public String update(ModelVo Modelvo) {
+        if (Modelvo==null||Modelvo.getParentId()==null) {
+            return "无修改数据";
+        }
+        Model Model = selectById(Modelvo.getParentId());
+        if (Model==null||(!Model.getIsDel().equals(NOT_DELETE))||BASE_PARENT_ID.equals(Model.getParentId())) {
+            return "该标签不能修改";
+        }
+
+        if (CollectionUtils.isNotEmpty(Modelvo.getList())) {
+            for (Model el : Modelvo.getList()) {
+                if (el.getId()==null) {
+                    el.setIsDel(NOT_DELETE);
+                    el.setCreTime(new Date());
+                    el.setParentId(Modelvo.getParentId());
+                    if (el.getRank() == null) {
+                        el.setRank(0);
+                    }
+                    mapper.insertSelective(el);
+                }else {
+                    el.setUpdTime(new Date());
+                    mapper.updateByPrimaryKeySelective(el);
+                }
+            }
+        }
+      return null;
+    }
+}

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

+package com.xxfc.platform.uccn.biz;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.uccn.dto.SeoDTO;
+import com.xxfc.platform.uccn.entity.SEO;
+import com.xxfc.platform.uccn.mapper.SEOMapper;
+import com.xxfc.platform.uccn.vo.SEOQuery;
+import com.xxfc.platform.uccn.vo.SEOVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.BeanUtilsBean;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Service
+@Slf4j
+public class SEOBiz extends BaseBiz<SEOMapper, SEO> {
+
+    public PageInfo<SeoDTO> getList(SEOQuery query) {
+        PageHelper.startPage(query.getPage(),query.getLimit());
+        List<SeoDTO> seodtoList = mapper.getSEODTOList();
+        return PageInfo.of(seodtoList);
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    public boolean update(SEOVo seoVo)  {
+
+        try {
+            if (seoVo==null) {
+                return false;
+            }
+            SEO seo = new SEO();
+            BeanUtilsBean.getInstance().copyProperties(seo,seoVo);
+            Example example = new Example(SEO.class);
+             example.createCriteria().andEqualTo("modelId", seo.getModelId());
+            List<SEO> list = mapper.selectByExample(example);
+            if (CollectionUtils.isEmpty(list)) {
+                seo.setCreTime(new Date());
+                mapper.insertSelective(seo);
+            }else if (list.size()==1){
+                seo.setUpdTime(new Date());
+                mapper.updateByPrimaryKeySelective(seo);
+            }else {
+                log.error("错误!该模块保存有多个seo");
+                return false;
+            }
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false;
+        }
+    }
+
+    public SEO getSeoByModelId(Integer modelId) {
+        SEO seo = new SEO();
+        seo.setModelId(modelId);
+        return selectOne(seo);
+    }
+}

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

@@ -187,9 +187,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
             if (summitActivities.size() <= num) {
                 for (SummitActivity summitActivity : summitActivities) {
                     summitActivityVo = new SummitActivityVo();
-                    summitActivityVo.setId(summitActivity.getId());
-                    summitActivityVo.setBanner(summitActivity.getBanner());
-                    summitActivityVo.setTitle(summitActivity.getTitle());
+                    BeanUtils.copyProperties(summitActivity,summitActivityVo);
                     summitActivityVos.add(summitActivityVo);
                 }
             } else {
@@ -198,9 +196,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
                 for (Integer i : resultSet) {
                     summitActivityVo = new SummitActivityVo();
                     SummitActivity summitActivity = summitActivities.get(i);
-                    summitActivityVo.setId(summitActivity.getId());
-                    summitActivityVo.setBanner(summitActivity.getBanner());
-                    summitActivityVo.setTitle(summitActivity.getTitle());
+                    BeanUtils.copyProperties(summitActivity,summitActivityVo);
                     summitActivityVos.add(summitActivityVo);
                 }
             }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/mapper/FriendLinkMapper.java

+package com.xxfc.platform.uccn.mapper;
+
+import com.xxfc.platform.uccn.entity.FriendLink;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:58
+ */
+public interface FriendLinkMapper extends Mapper<FriendLink> {
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/mapper/ModelBackgroundMapper.java

+package com.xxfc.platform.uccn.mapper;
+
+import com.xxfc.platform.uccn.entity.Model;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface ModelBackgroundMapper extends Mapper<Model>  {
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/mapper/SEOMapper.java

+package com.xxfc.platform.uccn.mapper;
+
+import com.xxfc.platform.uccn.dto.SeoDTO;
+import com.xxfc.platform.uccn.entity.SEO;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+public interface SEOMapper extends Mapper<SEO> {
+    List<SeoDTO> getSEODTOList();
+}

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

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.uccn.biz.FriendLinkBiz;
+import com.xxfc.platform.uccn.vo.FriendLinkVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:59
+ */
+@RestController
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequestMapping("/app/unauth/friend_link")
+@Api(tags = "友情链接*官网")
+public class FriendLinkController {
+
+     private final FriendLinkBiz friendLinkBiz;
+
+     @ApiOperation("查询链接列表")
+     @GetMapping("/list")
+     public ObjectRestResponse<List<FriendLinkVO>> listFriendLink(@RequestParam(value = "platform",required = false,defaultValue = "1") Integer platform){
+         List<FriendLinkVO> friendLinkVOS = friendLinkBiz.listFriendLinkByPlatform(platform);
+         return ObjectRestResponse.succ(friendLinkVOS);
+     }
+
+}

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

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.uccn.biz.SEOBiz;
+import com.xxfc.platform.uccn.entity.SEO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("seo")
+@Api(tags={"seo后台管理类"})
+public class SEOController extends BaseController<SEOBiz, SEO> {
+
+
+
+    @GetMapping("/app/unauth/officialWebsite/{modelId}")
+    @ApiOperation(value = "获取官网seo")
+    @IgnoreUserToken
+    public ObjectRestResponse getSeoByModelId(@PathVariable Integer modelId){
+        return ObjectRestResponse.succ(baseBiz.getSeoByModelId(modelId));
+    }
+}
\ No newline at end of file

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

+package com.xxfc.platform.uccn.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.uccn.biz.FriendLinkBiz;
+import com.xxfc.platform.uccn.dto.FriendLinkDTO;
+import com.xxfc.platform.uccn.dto.FriendLinkFindDTO;
+import com.xxfc.platform.uccn.vo.FriendLinkAdminVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:59
+ */
+@RestController
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequestMapping("/admin/friend_link")
+@Api(tags = "友情链接*后台")
+public class FriendLinkAdminController {
+
+     private final FriendLinkBiz friendLinkBiz;
+
+     @ApiOperation("分页")
+     @PostMapping("/page")
+     public ObjectRestResponse<PageDataVO<FriendLinkAdminVO>> listFriendLinkWithPage(@RequestBody FriendLinkFindDTO friendLinkFindDTO){
+          PageDataVO<FriendLinkAdminVO> pageDataVO = friendLinkBiz.listFriendLinkWithPage(friendLinkFindDTO);
+          return ObjectRestResponse.succ(pageDataVO);
+     }
+
+     @ApiOperation("根据id查询")
+     @GetMapping("/{id}")
+     public ObjectRestResponse<FriendLinkDTO> findFriendLink(@PathVariable(value = "id") Long id){
+          FriendLinkDTO friendLinkDTO = friendLinkBiz.findFriendLinkById(id);
+          return ObjectRestResponse.succ(friendLinkDTO);
+     }
+
+     @ApiOperation("编辑或保存")
+     @PostMapping("/save")
+     public ObjectRestResponse<Void> saveFriendLink(@RequestBody FriendLinkDTO friendLinkDTO){
+          friendLinkBiz.saveFriendLink(friendLinkDTO);
+          return ObjectRestResponse.succ();
+     }
+
+     @ApiOperation("上下架")
+     @PutMapping("/on_state/{id}/{state}")
+     public ObjectRestResponse<Void> updateFriendLinkOnstate(@PathVariable(value = "id") Long id,@PathVariable(value = "state") Boolean state){
+          friendLinkBiz.updateFriendLinkOnStateById(id,state);
+          return ObjectRestResponse.succ();
+     }
+
+     @ApiOperation("删除")
+     @DeleteMapping("/{id}")
+     public ObjectRestResponse<Void> deleteFriendLink(@PathVariable(value = "id") Long id){
+          friendLinkBiz.deleteFriendLinkById(id);
+          return ObjectRestResponse.succ();
+     }
+
+
+}

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

+package com.xxfc.platform.uccn.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.uccn.biz.ModelBackgroundBiz;
+import com.xxfc.platform.uccn.entity.Model;
+import com.xxfc.platform.uccn.vo.ModelVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("Model")
+@Api(tags={"Model后台管理类"})
+public class ModelBackgroundController extends BaseController<ModelBackgroundBiz, Model> {
+
+    @GetMapping("/list")
+    @ApiOperation(value = "查询模块列表")
+    public ObjectRestResponse findList(){
+       return ObjectRestResponse.succ(baseBiz.getList());
+    }
+
+    @PutMapping("/upd")
+    @ApiOperation(value = "修改模块")
+    public ObjectRestResponse update(@RequestBody ModelVo modelvo){
+        String update = baseBiz.update(modelvo);
+        if (update==null) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,update) ;
+    }
+}

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

+package com.xxfc.platform.uccn.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.uccn.biz.SEOBiz;
+import com.xxfc.platform.uccn.entity.SEO;
+import com.xxfc.platform.uccn.vo.SEOQuery;
+import com.xxfc.platform.uccn.vo.SEOVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("seoBackground")
+@Api(tags={"seo后台管理类"})
+public class SEOBackgroundController extends BaseController<SEOBiz, SEO> {
+
+    @PostMapping("/list")
+    @ApiOperation(value = "查询模块列表")
+    public ObjectRestResponse findList(@RequestBody SEOQuery query){
+       return ObjectRestResponse.succ(baseBiz.getList(query));
+    }
+
+    @PutMapping("/upd")
+    @ApiOperation(value = "修改模块")
+    public ObjectRestResponse update(@RequestBody  SEOVo seoVo){
+        boolean result = baseBiz.update(seoVo);
+        if (result) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail() ;
+    }
+
+
+}

xx-uccn/xx-uccn-server/src/main/resources/mapper/ArticleMapper.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.xxfc.platform.uccn.mapper.ArticleMapper">
 
     <select id="getArticleList" resultType="com.xxfc.platform.uccn.entity.Article">
-        select id, title,epitome,add_time,cover_image from article
+        select id, title,epitome,add_time,cover_image,`alt` from article
         where
         is_del=0
         and status=1

xx-uccn/xx-uccn-server/src/main/resources/mapper/SEOMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.xxfc.platform.uccn.mapper.SEOMapper">
+
+    <select id="getSEODTOList" resultType="com.xxfc.platform.uccn.dto.SeoDTO">
+     select
+     m.name as modelName ,
+     m.id as model_id,
+     s.id,
+     s.title as title,
+     s.keywords as keywords,
+     s.description as description,
+     s.header as header
+     from
+     model m
+     left join
+     seo s
+     on
+     m.id= s.model_id
+     WHERE
+     m.is_del = 0
+     ORDER BY
+     m.`level` ASC
+    </select>
+
+
+</mapper>
\ No newline at end of file

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

 package com.xxfc.platform.vehicle.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
-import javax.persistence.*;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
 
 
 /**
@@ -164,4 +166,7 @@ public class VehicleModel implements Serializable {
 	@Column(name = "intro")
 	@ApiModelProperty(value = "简介")
 	private String intro;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String alt;
 }

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

@@ -53,4 +53,7 @@ public class VehicleModelVo extends VehicleModel implements Serializable {
 	 */
 	List<VehiclePlatCata> UccnCataList;
 
+	@ApiModelProperty("seo*html标签优化")
+	private String alt;
+
 }

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

@@ -59,7 +59,6 @@ public class VehicleActiveService {
      * @param departureVo
      */
     public void departure(VehicleDepartureVo departureVo) {
-        try {
         Vehicle vehicle = vehicleMapper.selectByPrimaryKey(departureVo.getVehicleId());
         if (vehicle == null) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
@@ -86,11 +85,9 @@ public class VehicleActiveService {
             vehicle.setMileageLastUpdate(MileageLift1);
             vehicle.setExpectDestinationBranchCompanyId(departureVo.getExpectArrivalBranchCompanyId());
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
-
             // 修改车辆状态，确认是空闲状态
             int result = vehicleMapper.updateStatusByIdAndStatus(departureVo.getVehicleId(), VehicleStatus.DEPARTURE.getCode(),
                     VehicleStatus.NORMAL.getCode());
-
             if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
@@ -133,9 +130,8 @@ public class VehicleActiveService {
                     departureLog.setUserTel(vehicleBookRecord.getVehicleUserPhone());
                 }
                 vehicleDepartureLogMapper.insert(departureLog);
+                log.info("收车成功： 收车记录：departureLog = {}", departureLog.toString());
             }
-
-
             // 车辆活动日志
             VehicleActiveLog activeLog = new VehicleActiveLog();
             activeLog.setVehicleId(departureVo.getVehicleId());
@@ -147,10 +143,6 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
     }
 
 
@@ -202,10 +194,6 @@ public class VehicleActiveService {
                 throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
                         ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
             }
-//        if (!vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
-//            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
-//                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
-//        }
             Integer Mileagerest = vehicle.getMileageLastUpdate();
             Integer Mileagerest1 = arrivalVo.getMileage();
             if (Mileagerest1 == null) {
@@ -218,7 +206,6 @@ public class VehicleActiveService {
                     vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
                     updateBookRecordStatus(vehicleBookRecord, 2);
                 }
-
                 // 写入车辆公里数,还车分公司id
                 vehicle.setMileageLastUpdate(Mileagerest1);
                 if (vehicleBookRecord != null) {
@@ -226,12 +213,8 @@ public class VehicleActiveService {
                 }
                 vehicle.setExpectDestinationBranchCompanyId(0);
                 vehicleMapper.updateByPrimaryKeySelective(vehicle);
-
-
-
                 // 出车记录
                 VehicleDepartureLogVo departureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(arrivalVo.getBookRecordId());
-
                 if (departureLogVo == null) {
                     throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
                             ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
@@ -248,10 +231,6 @@ public class VehicleActiveService {
                 }
                 if(flag) { //如果此条记录后面还有未收车记录，就不修改车辆状态
                     int result = vehicleMapper.updateStatus(arrivalVo.getVehicleId(), VehicleStatus.NORMAL.getCode());
-//                if (result == 0) {
-//                    throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
-//                            ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
-//                }
                 }
 
                 DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());
@@ -298,23 +277,7 @@ public class VehicleActiveService {
                 activeLog.setEndTime(new Date());
                 activeLog.setUpdateTime(new Date());
                 vehicleActiveLogMapper.updateByPrimaryKeySelective(activeLog);
-
-                //取消预定时间 bookInfo和bookRecord
-//            BookVehicleVO bookVehicleVo = new BookVehicleVO();
-//            BeanUtils.copyProperties(vehicleBookRecord, bookVehicleVo);
-//            bookVehicleVo.setNotCheckTimeLegal(Boolean.TRUE);
-//            bookVehicleVo.setBookStartDate(null);
-//            bookVehicleVo.setBookEndDate(null);
-//            bookVehicleVo.setUnbookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DATE_TIME_FORMATTER));
-//            bookVehicleVo.setUnbookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
-//           try {
-//               Boolean hasSuc = vehicleBiz.unbookVehicle(bookVehicleVo);
-//               if(!hasSuc){
-//                   throw new BaseException(ResCode.VEHICLE_UNBOOK_FAIL.getDesc(), ResCode.VEHICLE_UNBOOK_FAIL.getCode());
-//               }
-//           } catch ( Exception e) {
-//                e.printStackTrace();
-//           }
+                log.info("收车成功： 收车记录：departureLog = {}", departureLog.toString());
             } else {
                 throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                         ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());