Merge branch 'holiday-price' into dev

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

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

@@ -135,4 +135,7 @@ public interface UserFeign {
                                                     @RequestParam(value = "cono",required = false) String cono,
                                                     @RequestParam(value = "reason",required = false) String reason,
                                                     @RequestParam(value = "isSuccess") Boolean isSuccess);
+
+    @GetMapping("/member/user")
+    BaseUserMember findBaseUserMemberByUserId(@RequestParam(value = "userId") Integer userId);
 }

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

 package com.github.wxiaoqi.security.admin.mapper;
+
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.springframework.stereotype.Repository;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -14,7 +13,6 @@ import java.util.List;
  * @email nishijjo@qq.com
  * @date 2019-06-11 11:06:45
  */
-@Repository
 public interface BaseUserMemberLevelMapper extends Mapper<BaseUserMemberLevel> {
 
     List<BaseUserMemberLevel> selectUserMembersLevelByLevels(@Param("levels") List<Integer> levels);

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

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.BaseUserMemberBiz;
+import com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,4 +50,9 @@ public class UserMemberController {
     ) throws Exception {
         return memberBiz.upMemberDays(userId, days, type);
     }
+
+    @GetMapping("/user")
+    public  BaseUserMemberVO findBaseUserMemberByUserId(@RequestParam(value = "userId") Integer userId){
+        return memberBiz.findOneByUserId(userId);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 import javax.persistence.*;
 
@@ -146,6 +147,20 @@ public class OrderItem implements Serializable {
 		return calculateAmount;
 	}
 
+	public BigDecimal calculateVehicleUnitPrice(BigDecimal vehicleAmount, BigDecimal metaVehicleAmount, Boolean isSetRealAmount) {
+		BigDecimal unitPrice = vehicleAmount.divide(new BigDecimal(getCalculateNum()+ ""), 2, RoundingMode.HALF_UP);
+		BigDecimal metaUnitPrice = metaVehicleAmount.divide(new BigDecimal(getCalculateNum()+ ""), 2, RoundingMode.HALF_UP);
+
+		if(isSetRealAmount) {
+			setRealAmount(vehicleAmount);
+		}
+
+		setUnitPrice(unitPrice);
+		setMetaUnitPrice(metaUnitPrice);
+
+		return unitPrice;
+	}
+
 	public BigDecimal getBuyAmount() {
 		return getUnitPrice().multiply(new BigDecimal(getBuyNum() + ""));
 	}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderItemDTO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderItemDetailDTO.java

 package com.xxfc.platform.order.pojo.order;
 
 import com.xxfc.platform.order.entity.OrderItem;
+import lombok.Data;
 
-public class OrderItemDTO extends OrderItem {
+import java.math.BigDecimal;
+
+@Data
+public class OrderItemDetailDTO {
+    Integer day;
+    BigDecimal price;
 }

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

 package com.xxfc.platform.order.pojo.order;
 
+import cn.hutool.core.date.DateUtil;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.order.entity.BaseOrder;
@@ -12,6 +13,7 @@ import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -59,4 +61,19 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
      */
     @ApiModelProperty(hidden = true)
     Integer useType = 1;
+
+    /**
+     * 开始时间
+     */
+    private Date startDate;
+
+    /**
+     * 开始时间
+     */
+    private Date endDate;
+
+    public void initDate() {
+        this.startDate = DateUtil.date(getStartTime());
+        this.endDate = DateUtil.date(getEndDate());
+    }
 }

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

@@ -40,10 +40,15 @@ public class RentVehiclePriceVO extends OrderPriceVO{
 //    private Integer originDayNum;
 
     /**
-     * 免费天数
+     * 消耗的免费天数
      */
     private Integer freeDayNum = 0;
 
+    /**
+     * 扣减天数
+     */
+    private Integer cutDayNum = 0;
+
     /**
      * 免费价格
      */

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

@@ -18,7 +18,7 @@ import java.math.BigDecimal;
  */
 @Service
 public class OrderItemBiz extends BaseBiz<OrderItemMapper,OrderItem> {
-    public OrderItem initOrderItem(BigDecimal price, Integer num, String name, Integer goodId, ItemTypeEnum itemTypeEnum){
+    public OrderItem initOrderItem(BigDecimal price, Integer num, String name, Integer goodId, ItemTypeEnum itemTypeEnum, String detail){
         return new OrderItem(){{
             setMetaUnitPrice(price);
             setUnitPrice(price);
@@ -30,6 +30,11 @@ public class OrderItemBiz extends BaseBiz<OrderItemMapper,OrderItem> {
             setName(name);
             setGoodId(goodId);
             setType(itemTypeEnum.getCode());
+            setDetail(detail);
         }};
     }
+
+    public OrderItem initOrderItem(BigDecimal price, Integer num, String name, Integer goodId, ItemTypeEnum itemTypeEnum){
+        return initOrderItem(price, num, name, goodId, itemTypeEnum, null);
+    }
 }
\ No newline at end of file

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

@@ -37,6 +37,7 @@ import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.RentVehicleBookDTO;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleModelCalendarPriceDTO;
 import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -220,12 +221,14 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         BigDecimal orderAmount = BigDecimal.ZERO;
         BigDecimal goodsAmount = BigDecimal.ZERO;
         BigDecimal vehicleAmount = BigDecimal.ZERO;
+        BigDecimal metaVehicleAmount = BigDecimal.ZERO;
         BigDecimal driverAmount = BigDecimal.ZERO;
         BigDecimal damageSafeAmount = BigDecimal.ZERO;
         BigDecimal couponAmount = BigDecimal.ZERO;
         String couponDesc = "";
         Integer vehicleDayNum = 0;
         Integer freeDayNum = 0;
+        Integer cutDayNum = 0;
 
         //当前用户
         AppUserDTO dto = detail.getAppUserDTO();
@@ -233,28 +236,39 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         //车型信息
         VehicleModel vehicleModel = vehicleFeign.get(detail.getModelId()).getData();
 
+        detail.initDate();
+        List<VehicleModelCalendarPriceDTO> vmcpds = vehicleFeign.findVehicleModelCalendarPriceByDate(detail.getStartDate(), detail.getEndDate(), detail.getModelId(), dto.getUserid());
+
+
         //设置Item
-        OrderItem vehicleOrderItem = orderItemBiz.initOrderItem(vehicleModel.getPrice(), detail.getDayNum(), vehicleModel.getName(), vehicleModel.getId(), ItemTypeEnum.VEHICLE_MODEL);
+        OrderItem vehicleOrderItem = orderItemBiz.initOrderItem(vehicleModel.getPrice(), detail.getDayNum(), vehicleModel.getName(), vehicleModel.getId(), ItemTypeEnum.VEHICLE_MODEL, JSONUtil.parseArray(vmcpds).toString());
         OrderItem driverOrderItem = orderItemBiz.initOrderItem(DRIVER_PRICE, detail.getDayNum(), "平台司机", null, ItemTypeEnum.DRIVER);
         OrderItem damageSafeOrderItem = orderItemBiz.initOrderItem(DAMAGE_SAFE, detail.getDayNum(), "免赔费用", null, ItemTypeEnum.DAMAGE_SAFE);
 
         detail.setItems(new ArrayList<OrderItem>());
         detail.getItems().add(vehicleOrderItem);
 
-        //如果用户存在，并且为会员，并且车辆有优惠价
+        //如果用户存在，免费天数
         if(null != dto && null != detail.getRentFreeDay() && detail.getRentFreeDay() > 0 ) {
             if(null == dto.getRentFreeDays() || dto.getRentFreeDays() <= 0) {
                 throw new BaseException(ResultCode.PARAM_EPIRE_CODE, new HashSet<String>() {{
                     add("免费租车天数不存在或为0");
                 }});
             }
-            if(detail.getDayNum() > dto.getRentFreeDays()) {
-                freeDayNum = dto.getRentFreeDays();
-            }else {
-                freeDayNum = detail.getDayNum();
+
+            //循环价格列表 获得对应消耗的免费天数
+            for(VehicleModelCalendarPriceDTO vmcpd : vmcpds) {
+                //如果新的相加消耗天数 大于 拥有天数
+                if(freeDayNum+ vmcpd.getFreeDays() > dto.getRentFreeDays()) {
+                    //freeDayNum = dto.getRentFreeDays();
+                    break;
+                }else {
+                    freeDayNum += detail.getDayNum();
+                    cutDayNum += 1;
+                }
             }
-            vehicleOrderItem.setCutNum(freeDayNum);
-            vehicleDayNum = detail.getDayNum() - freeDayNum;
+            vehicleOrderItem.setCutNum(cutDayNum);
+            vehicleDayNum = detail.getDayNum() - cutDayNum;
             detail.getOrder().setHasMemberRight(SYS_TRUE);
         }else {
             vehicleDayNum = detail.getDayNum();
@@ -272,27 +286,37 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             String[] prices = StrUtil.isBlank(vehicleModel.getRentDiscountPrice())
                     ?new String[]{vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString()}
                     :vehicleModel.getRentDiscountPrice().split(",");
-            HandleDiscountDTO handleDiscountDTO = new HandleDiscountDTO();
-            handleDiscountDTO.setRebate(100);
-            handleDiscountDTO.setModelAmount(vehicleModel.getPrice());
-            switch (MemberEnum.getByCode(dto.getMemberLevel())) {
-                case NORMAL:
-                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, NORMAL);
-                    detail.getOrder().setHasMemberRight(SYS_TRUE);
-                break;
-                case GOLD:
-                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, GOLD);
-                    detail.getOrder().setHasMemberRight(SYS_TRUE);
-                    break;
-                case DIAMOND:
-                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, DIAMOND);
-                    detail.getOrder().setHasMemberRight(SYS_TRUE);
-                    break;
-                default:
-                    break;
+//            HandleDiscountDTO handleDiscountDTO = new HandleDiscountDTO();
+//            handleDiscountDTO.setRebate(100);
+//            handleDiscountDTO.setModelAmount(vehicleModel.getPrice());
+//            switch (MemberEnum.getByCode(dto.getMemberLevel())) {
+//                case NORMAL:
+//                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, NORMAL);
+//                    detail.getOrder().setHasMemberRight(SYS_TRUE);
+//                break;
+//                case GOLD:
+//                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, GOLD);
+//                    detail.getOrder().setHasMemberRight(SYS_TRUE);
+//                    break;
+//                case DIAMOND:
+//                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, DIAMOND);
+//                    detail.getOrder().setHasMemberRight(SYS_TRUE);
+//                    break;
+//                default:
+//                    break;
+//            }
+            detail.setRebate(dto.getDiscount());
+//            vehicleOrderItem.setUnitPrice(handleDiscountDTO.getModelAmount());
+        }
+
+        //计算价格
+        if(vehicleDayNum > 0) {
+            for(int i = cutDayNum; i < vmcpds.size(); i++) {
+                vehicleAmount.add(vmcpds.get(i).getPrice());
+                metaVehicleAmount.add(vmcpds.get(i).getNo_discount_price());
             }
-            detail.setRebate(handleDiscountDTO.getRebate());
-            vehicleOrderItem.setUnitPrice(handleDiscountDTO.getModelAmount());
+        }else {
+            vehicleOrderItem.setUnitPrice(BigDecimal.ZERO);
         }
 
         //如果有使用会员权益或者优惠券，则设置订单已优惠
@@ -300,8 +324,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             detail.getOrder().setHasDiscount(SYS_TRUE);
         }
 
-        //单价 * （购买天数 - 减免天数）
-        vehicleAmount = vehicleAmount.add(vehicleOrderItem.getCalculateAmount(Boolean.TRUE));
+        //平均单价 = 总价 / 实际消费天数
+        vehicleOrderItem.calculateVehicleUnitPrice(vehicleAmount, metaVehicleAmount, Boolean.TRUE);
 
         if(DRIVER_TYPE_COMPANY.equals(detail.getDriverType())) {
             //计算司机费用
@@ -364,6 +388,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         rvp.setVehicleDayNum(vehicleDayNum);
 
         rvp.setFreeDayNum(freeDayNum);
+        rvp.setCutDayNum(cutDayNum);
         rvp.setFreeAmount(vehicleOrderItem.getCutAmount());
         rvp.setBuyVehicleAmount(vehicleOrderItem.getBuyAmount());
         rvp.setRealVehicleAmount(vehicleOrderItem.getRealAmount());

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

+package com.xxfc.platform.vehicle.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/18 17:29
+ */
+@Data
+@Table(name = "festival")
+@NoArgsConstructor
+@AllArgsConstructor
+public class Festival {
+     @Id
+     @GeneratedValue(generator = "JDBC")
+     private Integer id;
+     private String name;
+     @Column(name = "crt_time")
+     private Date crtTime;
+}

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

+package com.xxfc.platform.vehicle.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+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;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 车型日历价格
+ * @data 2019/10/14 16:32
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "vehicle_model_calendar_price")
+public class VehicleModelCalendarPrice implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Long id;
+    /**
+     * 日期设置
+     */
+    @Column(name = "vehicle_model_day")
+    private Date vehicleModelDay;
+    /**
+     * 是否全局设置
+     */
+    @Column(name = "is_global")
+    private Boolean isGlobal;
+    /**
+     * 车型id
+     */
+    @Column(name = "vehicle_model_id")
+    private Integer vehicleModelId;
+    /**
+     * 1：倍数 2：绝对值  3：会员价
+     */
+    private Integer type;
+    /**
+     * 倍数
+     */
+    private Double multiple;
+    /**
+     * 抵扣天数
+     */
+    @Column(name = "free_days")
+    private Integer freeDays;
+    /**
+     * 绝对值 或会员价
+     */
+    private BigDecimal price;
+    /**
+     * 创建时间
+     */
+    @Column(name = "crt_time")
+    private Date crtTime;
+    /**
+     * 更新时间
+     */
+    @Column(name = "upd_time")
+    private Date updTime;
+    /**
+     * 创建者id
+     */
+    @Column(name = "crt_userId")
+    private Integer crtUserId;
+    /**
+     * 更新者id
+     */
+    @Column(name = "upd_userId")
+    private Integer updUserId;
+
+    @Column(name = "is_del")
+    private Integer isDel;
+
+    /**
+     * 会员等级 1：普通  2：黄金 3：钻石
+     */
+    private Integer level;
+}

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

+package com.xxfc.platform.vehicle.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/14 16:30
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@Table(name = "vehicle_model_holiday_price")
+public class VehicleModelHolidayPrice implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Long id;
+    /**
+     * 节假日日期
+     */
+    @Column(name = "festival_day")
+    private Date festivalDay;
+    /**
+     * 节假日
+     */
+    @Column(name = "festival_id")
+    private Integer festivalId;
+    /**
+     * 倍数
+     */
+    private Double multiple;
+    /**
+     * 免费天数
+     */
+    @Column(name = "free_days")
+    private Integer freeDays;
+    /**
+     * 创建时间
+     */
+    @Column(name = "crt_time")
+    private Date crtTime;
+    /**
+     * 创建者
+     */
+    @Column(name = "crt_userId")
+    private Integer crtUserId;
+    /**
+     * 更新时间
+     */
+    @Column(name = "upd_time")
+    private Date updTime;
+    /**
+     * 更新者
+     */
+    @Column(name = "upd_userId")
+    private Integer updUserId;
+
+    @Column(name = "is_del")
+    private Integer isDel;
+}

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

@@ -7,6 +7,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.pojo.*;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleModelCalendarPriceDTO;
 import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
 import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
 import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
@@ -14,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -21,7 +23,7 @@ import java.util.Set;
 /**
  * Created by ace on 2017/9/15.
  */
-@FeignClient(name = "vehicle",contextId = "vh")
+@FeignClient(name = "vehicle", contextId = "vh")
 public interface VehicleFeign {
     @GetMapping(value = "/vehicleModel/{id}")
     public ObjectRestResponse<VehicleModel> get(@PathVariable(value = "id") int id);
@@ -33,7 +35,7 @@ public interface VehicleFeign {
     public RestResponse<Vehicle> findById(@RequestParam(value = "id") String id);
 
     @RequestMapping(value = "/vehicleInfo/getByIds", method = RequestMethod.GET)
-    public RestResponse< List<Vehicle>> getByIds(@RequestParam(value = "ids") List<String> id);
+    public RestResponse<List<Vehicle>> getByIds(@RequestParam(value = "ids") List<String> id);
 
     //提车
     @PostMapping("/active/small/departure")
@@ -53,7 +55,7 @@ public interface VehicleFeign {
     @RequestMapping(value = "/vehicleInfo/rent/book/vehicle", method = RequestMethod.POST)
     public ObjectRestResponse<VehicleBookRecord> rentApplyVehicle(@RequestBody RentVehicleBookDTO rentVehicleBookDTO);
 
-    @RequestMapping(value ="/branchCompany/app/unauth/detail/{id}",method = RequestMethod.GET)
+    @RequestMapping(value = "/branchCompany/app/unauth/detail/{id}", method = RequestMethod.GET)
     public ObjectRestResponse<CompanyDetail> getCompanyDetail(@PathVariable(value = "id") Integer id);
 
     //租车拒绝预约
@@ -70,15 +72,11 @@ public interface VehicleFeign {
 
     //获取分公司列表
     @GetMapping("/branchCompany/all")
-    public  List<BranchCompany>  companyAll(
+    public List<BranchCompany> companyAll(
             @RequestParam(value = "dataAll") Integer dataAll,
             @RequestParam(value = "dataCompany") String dataCompany,
             @RequestParam(value = "dataZone") String dataZone);
 
-    //获取分公司列表
-    @GetMapping("/company/base/app/unauth/companyId")
-    public  BranchCompany  companyId(@RequestParam(value = "name") String name);
-
     @GetMapping("/branchCompany/entityList")
     public ObjectRestResponse<List<BranchCompany>> branchCompanyEntityList(@RequestParam("entity") Map<String, Object> entity);
 
@@ -87,7 +85,7 @@ public interface VehicleFeign {
 
     @RequestMapping(value = "/user/license/company/getOne", method = RequestMethod.GET)
     public RestResponse<VehicleUserLicense> getOne(
-            @RequestParam(value = "id", defaultValue = "0") Integer id) throws Exception ;
+            @RequestParam(value = "id", defaultValue = "0") Integer id) throws Exception;
 
     @RequestMapping(value = "/user/license/multi", method = RequestMethod.GET)
     public ObjectRestResponse<List<VehicleUserLicense>> multi(@RequestBody QueryMultiDTO dto) throws Exception;
@@ -97,6 +95,7 @@ public interface VehicleFeign {
 
     /**
      * 获取优质车型接口
+     *
      * @param page
      * @param limit
      * @return 返回
@@ -106,13 +105,16 @@ public interface VehicleFeign {
 
     /**
      * 根据一个id获取城市
+     *
      * @param id
      * @return
      */
     @GetMapping("/sysRegion/getSysRegionById/{id}")
-   RestResponse getSysRegionById(@PathVariable(value = "id") Integer id);
+    RestResponse getSysRegionById(@PathVariable(value = "id") Integer id);
+
     /**
      * 多个城市code获取城市代码
+     *
      * @param idSet
      * @return
      */
@@ -121,6 +123,7 @@ public interface VehicleFeign {
 
     /**
      * 获取公司所在的城市
+     *
      * @param zoneList
      * @param companyList
      * @return
@@ -147,8 +150,10 @@ public interface VehicleFeign {
 
 
     //cata
+
     /**
      * 查询当前车型拥有的标签
+     *
      * @param ids
      * @return
      */
@@ -160,6 +165,7 @@ public interface VehicleFeign {
 
     /**
      * 根据位置查询
+     *
      * @param branchCompanyFindDTO
      * @return
      */
@@ -172,4 +178,18 @@ public interface VehicleFeign {
     @RequestMapping(value = "/vehicleInfo/bookRecord/update", method = RequestMethod.POST)
     public ObjectRestResponse update(@RequestBody BookRecordUpdateLog bookRecordUpdateLog);
 
+    /**
+     * 车型日历价格
+     * @param startDate
+     * @param endDate
+     * @param vehicleModelId
+     * @param userId
+     * @return
+     */
+    @GetMapping("/vehicle_model/calendar_price/app/unauth/price")
+    List<VehicleModelCalendarPriceDTO> findVehicleModelCalendarPriceByDate(@RequestParam(value = "startDate") Date startDate,
+                                                                           @RequestParam(value = "endDate") Date endDate,
+                                                                           @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
+                                                                           @RequestParam(value = "userId") Integer userId);
+
 }

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

+package com.xxfc.platform.vehicle.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/14 17:11
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class VehicleModelCalendarPriceDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Date date;
+    private BigDecimal price;
+    private BigDecimal no_discount_price;
+    private Integer freeDays;
+    private Boolean isSelect;
+}

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

+package com.xxfc.platform.vehicle.pojo.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/14 17:11
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class VehicleModelCalendarPriceSaveDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    /**
+     * 日期设置
+     */
+    @JSONField(serialize = false)
+    private Date vehicleModelDay;
+
+    private String  date;
+    /**
+     * 是否全局设置
+     */
+    private Boolean isGlobal;
+    /**
+     * 车型id
+     */
+    private Integer vehicleModelId;
+    /**
+     * 1：倍数 2：绝对值  3：会员价
+     */
+    private Integer type;
+    /**
+     * 倍数
+     */
+    private Double multiple;
+    /**
+     * 抵扣天数
+     */
+    private Integer freeDays;
+    /**
+     * 绝对值 或会员价
+     */
+    private BigDecimal price;
+
+    /**
+     * 会员等级 1：普通  2：黄金 3：钻石
+     */
+    private Integer level;
+}

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

+package com.xxfc.platform.vehicle.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/15 18:06
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class VehicleModelDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer vehicleModelId;
+    private String name;
+    private BigDecimal basePrice;
+}

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

+package com.xxfc.platform.vehicle.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/14 18:59
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class VehicleModelHolidayPriceDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 节假日日期
+     */
+    private Date festivalDay;
+    /**
+     * 节假日
+     */
+    private String festival;
+    /**
+     * 倍数
+     */
+    private Double multiple;
+    /**
+     * 免费天数
+     */
+    private Integer freeDays;
+
+}

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

+package com.xxfc.platform.vehicle.pojo.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/14 18:34
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class VehicleModelHolidayPriceFindDTO  extends PageParam {
+      private String festival;
+      private String  date;
+      private Integer  year;
+}

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

+package com.xxfc.platform.vehicle.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/14 17:12
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class VehicleModelHolidayPriceSaveDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 节假日id
+     */
+    private Integer id;
+    /**
+     * 节假日日期
+     */
+    private List<Date> date;
+    /**
+     * 节假日名称
+     */
+    private String festival;
+    /**
+     * 倍数
+     */
+    private Double multiple;
+    /**
+     * 免费天数
+     */
+    private Integer freeDays;
+}

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

+package com.xxfc.platform.vehicle.pojo.vo;
+
+import com.xxfc.platform.vehicle.pojo.dto.VehicleModelDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/15 17:55
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class VehicleModelDayPriceVo extends VehicleModelDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 绝对值 | 会员价
+     */
+    private BigDecimal price;
+
+    /**
+     * 倍数
+     */
+    private Double multiple;
+    /**
+     * 会员等级
+     */
+    private Integer level;
+}

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

+package com.xxfc.platform.vehicle.pojo.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/14 17:18
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class VehicleModelHolidayPriceVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    /**
+     * 节假日日期
+     */
+    private Date festivalDay;
+    /**
+     * 节假日
+     */
+    private String festival;
+    /**
+     * 倍数
+     */
+    private Double multiple;
+    /**
+     * 免费天数
+     */
+    private Integer freeDays;
+    /**
+     * 创建时间
+     */
+    private Date crtTime;
+    /**
+     * 更新时间
+     */
+    private Date updTime;
+}

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

+package com.xxfc.platform.vehicle.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.vehicle.entity.Festival;
+import com.xxfc.platform.vehicle.mapper.FestivalMapper;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/18 17:31
+ */
+@Transactional(rollbackFor = Exception.class)
+@Service
+public class FestivalBiz extends BaseBiz<FestivalMapper,Festival> {
+
+     public void add(Festival festival){
+         if (Objects.isNull(festival.getId())){
+             festival.setCrtTime(new Date());
+             mapper.insertSelective(festival);
+         }else {
+             mapper.updateByPrimaryKey(festival);
+         }
+     }
+
+     public void deleteById(Integer festivalId){
+         Festival festival = new Festival();
+         festival.setId(festivalId);
+         mapper.deleteByPrimaryKey(festival);
+     }
+
+    public Map<Integer, Festival> findFestivalsByIds(List<Integer> festivalIds) {
+         Map<Integer,Festival> festivalMap =  new HashMap<>(20);
+        List<Festival> festivals = mapper.selectByIdList(festivalIds);
+        if (CollectionUtils.isNotEmpty(festivalIds)){
+            festivalMap = festivals.stream().collect(Collectors.toMap(Festival::getId, Function.identity()));
+        }
+        return festivalMap;
+    }
+}

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.RandomUtil;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
@@ -13,6 +14,7 @@ import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.mapper.VehicleModelMapper;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleModelDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -21,6 +23,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -152,4 +155,16 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
 //        }
         return goodDataVOS;
     }
+
+    public BigDecimal findVehicleModelPriceByVehicleModelId(Integer vehicleModelId) {
+         BigDecimal price = mapper.selectPriceById(vehicleModelId);
+         if (price==null || price.doubleValue()==0.0){
+             throw  new BaseException("该车型不存在原价");
+         }
+        return price;
+    }
+
+    public List<VehicleModelDTO> findAllVehicleModel() {
+        return  mapper.findAllVehicleModel();
+    }
 }
\ No newline at end of file

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

+package com.xxfc.platform.vehicle.mapper;
+
+
+import com.xxfc.platform.vehicle.entity.Festival;
+import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/18 17:33
+ */
+public interface FestivalMapper extends Mapper<Festival>, SelectByIdListMapper<Festival,Integer> {
+}

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

+package com.xxfc.platform.vehicle.mapper;
+
+import com.xxfc.platform.vehicle.entity.VehicleModelCalendarPrice;
+import tk.mybatis.mapper.common.Mapper;
+import tk.mybatis.mapper.additional.insert.InsertListMapper;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/14 17:31
+ */
+public interface VehicleModelCalendarPriceMapper extends Mapper<VehicleModelCalendarPrice>, InsertListMapper<VehicleModelCalendarPrice> {
+}

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

+package com.xxfc.platform.vehicle.mapper;
+
+import com.xxfc.platform.vehicle.entity.VehicleModelHolidayPrice;
+import tk.mybatis.mapper.additional.insert.InsertListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/14 17:32
+ */
+public interface VehicleModelHolidayPriceMapper extends Mapper<VehicleModelHolidayPrice>, InsertListMapper<VehicleModelHolidayPrice> {
+}

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

@@ -3,9 +3,13 @@ package com.xxfc.platform.vehicle.mapper;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleModelDTO;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -26,4 +30,11 @@ public interface VehicleModelMapper extends Mapper<VehicleModel> {
      * @return
      */
     int updateScoreByModelIdAndavgScore(@Param("modelId") Integer modelId, @Param("avgScore") int avgScore);
+
+    @Select("select `price` from `vehicle_model` where `id`=#{vehicleModelId}")
+    BigDecimal selectPriceById(@Param("vehicleModelId") Integer vehicleModelId);
+
+    @Select({"select `id` AS `vehicleModelId`,`name`,`price` AS `basePrice` from `vehicle_model` where `isdel`=0"})
+    @ResultType(value = VehicleModelDTO.class)
+    List<VehicleModelDTO> findAllVehicleModel();
 }

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

+package com.xxfc.platform.vehicle.rest;
+
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.vehicle.biz.VehicleModelCalendarPriceBiz;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleModelCalendarPriceDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/14 17:35
+ */
+@RestController
+@RequestMapping("/vehicle_model/calendar_price/app/unauth")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@Api(tags = "车型日历价格")
+public class VehicleModelCalendarPriceController {
+
+    private final VehicleModelCalendarPriceBiz vehicleModelCalendarPriceBiz;
+
+
+    @ApiOperation("返回车型日历价格")
+    @GetMapping("/list/{vehicleModelId}")
+    @IgnoreUserToken
+    @SneakyThrows
+    public ObjectRestResponse<VehicleModelCalendarPriceDTO> listVehicleModelCalendarPriceByDateAndVehicleModelId(@RequestParam(value = "start", required = false) String start,
+                                                                                                                 @RequestParam(value = "end", required = false) String end,
+                                                                                                                 @PathVariable(value = "vehicleModelId") Integer vehicleModelId,
+                                                                                                                 AppUserDTO appUserDTO) {
+        if (StringUtils.isEmpty(start) || StringUtils.isEmpty(end)) {
+            throw new BaseException("缺少开始时间或结束时间");
+        }
+        Date startDate = Date.from(LocalDate.parse(start).atStartOfDay(ZoneId.systemDefault()).toInstant());
+        Date endDate = Date.from(LocalDate.parse(end).atStartOfDay(ZoneId.systemDefault()).toInstant());
+        List<VehicleModelCalendarPriceDTO> vehicleModelCalendarPriceVos = vehicleModelCalendarPriceBiz.listVehicleModelCalendarPriceByDateAndVehicleModelIdAndUserId(startDate, endDate, vehicleModelId, appUserDTO.getUserid());
+        return ObjectRestResponse.succ(vehicleModelCalendarPriceVos);
+    }
+
+    @GetMapping("/price")
+    public List<VehicleModelCalendarPriceDTO> findVehicleModelCalendarPriceByDate(@RequestParam(value = "startDate") Date startDate,
+                                                                                  @RequestParam(value = "endDate") Date endDate,
+                                                                                  @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
+                                                                                  @RequestParam(value = "userId") Integer userId) {
+        startDate = Date.from(startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
+        endDate = Date.from(endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
+        return vehicleModelCalendarPriceBiz.findVehicleModelCalendarPriceByDateAndVehilceIdAndUserId(startDate, endDate, vehicleModelId, userId);
+    }
+}

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

+package com.xxfc.platform.vehicle.rest.admin;
+
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.vehicle.biz.VehicleModelCalendarPriceBiz;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleModelCalendarPriceSaveDTO;
+import com.xxfc.platform.vehicle.pojo.vo.VehicleModelDayPriceVo;
+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.*;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/14 17:35
+ */
+@RestController
+@RequestMapping("/admin/vehicle_model/calendar_price")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@Api(tags = "车型日历价格")
+public class VehicleModelCalendarPriceAdminController {
+    private final VehicleModelCalendarPriceBiz vehicleModelCalendarPriceBiz;
+
+    @ApiOperation("车型日历价格设置")
+    @PostMapping("/add_edit")
+    public ObjectRestResponse<Void> add(@RequestBody List<VehicleModelCalendarPriceSaveDTO> vehicleModelCalendarPriceSaveDTO, UserDTO userDTO){
+        vehicleModelCalendarPriceBiz.addVehicleModelCalendarPrice(vehicleModelCalendarPriceSaveDTO,userDTO.getId());
+        return ObjectRestResponse.succ();
+    }
+
+    @ApiOperation("车型日历价格")
+    @GetMapping("/day")
+    public ObjectRestResponse<VehicleModelDayPriceVo> listVehicleModelCalendarPriceWithMonth(@RequestParam(value = "date") String dateStr){
+        Date date = Date.from(LocalDate.parse(dateStr).atStartOfDay(ZoneId.systemDefault()).toInstant());
+        List<VehicleModelDayPriceVo> vehicleModelDayPriceVos = vehicleModelCalendarPriceBiz.findVehicleModelcalendarPriceByDateWithDay(date);
+        return ObjectRestResponse.succ(vehicleModelDayPriceVos);
+    }
+
+    @ApiOperation("根据月份查询的设置")
+    @GetMapping("/month")
+    public ObjectRestResponse<List<VehicleModelCalendarPriceSaveDTO>> listVehicleModelCalendarPriceWithDay(@RequestParam(value = "date") String dateStr){
+        Date date = Date.from(LocalDate.parse(dateStr).atStartOfDay(ZoneId.systemDefault()).toInstant());
+        List<VehicleModelCalendarPriceSaveDTO> calendarPrices = vehicleModelCalendarPriceBiz.findVehicleModelCalendarPricesByDateWithMonth(date);
+        return ObjectRestResponse.succ(calendarPrices);
+    }
+
+    @ApiOperation("查询所有车型的的基本信息(id,价格)")
+    @GetMapping("/vehicle_model/all")
+    public ObjectRestResponse<VehicleModelDayPriceVo> listVehicleModelPrice(){
+        List<VehicleModelDayPriceVo> vehicleModelDayPriceVos = vehicleModelCalendarPriceBiz.listVehicleModelPrice();
+        return ObjectRestResponse.succ(vehicleModelDayPriceVos);
+    }
+}

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

+package com.xxfc.platform.vehicle.rest.admin;
+
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.vehicle.biz.VehicleModelHolidayPriceBiz;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleModelHolidayPriceFindDTO;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleModelHolidayPriceSaveDTO;
+import com.xxfc.platform.vehicle.pojo.vo.VehicleModelHolidayPriceVo;
+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.*;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/14 17:35
+ */
+@RestController
+@RequestMapping("/admin/vehicle_model/holiday_price")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@Api(tags = "节假日设置")
+public class VehicleModelHolidayPriceAdminController {
+    private final VehicleModelHolidayPriceBiz vehicleModelHolidayPriceBiz;
+
+    @ApiOperation("节假日添加|设置")
+    @PostMapping("/add_edit")
+    public ObjectRestResponse<Void> add(@RequestBody VehicleModelHolidayPriceSaveDTO vehicleModelHolidayPriceSaveDTO, UserDTO userDTO) {
+        vehicleModelHolidayPriceBiz.addVehicleModelHolidayPrice(vehicleModelHolidayPriceSaveDTO, userDTO.getId());
+        return ObjectRestResponse.succ();
+    }
+
+    @GetMapping("/{id}")
+    public ObjectRestResponse<VehicleModelHolidayPriceSaveDTO> findVehicleModelHolidayPrice(@PathVariable(value = "id") Long id){
+        VehicleModelHolidayPriceSaveDTO  vehicleModelHolidayPriceSaveDTO = vehicleModelHolidayPriceBiz.findVehicleModelHolidayPriceFestivalId(id);
+        return ObjectRestResponse.succ(vehicleModelHolidayPriceSaveDTO);
+    }
+
+    @ApiOperation("节假日页查询")
+    @PostMapping("/page")
+    public ObjectRestResponse<List<VehicleModelHolidayPriceVo>> listVehicleModelHolidayPrice(@RequestBody VehicleModelHolidayPriceFindDTO vehicleModelHolidayPriceFindDTO){
+        List<VehicleModelHolidayPriceVo> priceVoPageDataVO = vehicleModelHolidayPriceBiz.listVehicleModelHolidayPrice(vehicleModelHolidayPriceFindDTO);
+        return ObjectRestResponse.succ(priceVoPageDataVO);
+    }
+}