提现账号

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

@@ -84,4 +84,9 @@ public class VehicleModelCalendarPrice implements Serializable {
 
     @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/pojo/dto/VehicleModelCalendarPriceDTO.java

@@ -22,7 +22,8 @@ import java.util.Date;
 public class VehicleModelCalendarPriceDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    private Date date;
     private BigDecimal price;
-    private Date  bookDate;
     private Integer freeDays;
+    private Boolean isSelect;
 }

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

@@ -51,4 +51,8 @@ public class VehicleModelCalendarPriceSaveDTO implements Serializable {
      */
     private BigDecimal price;
 
+    /**
+     * 会员等级 1：普通  2：黄金 3：钻石
+     */
+    private Integer level;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/VehicleModelCalendarPriceVo.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.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author libin
- * @version 1.0
- * @description
- * @data 2019/10/15 9:43
- */
-@Data
-@Builder(toBuilder = true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class VehicleModelCalendarPriceVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private Date date;
-    private BigDecimal price;
-    private Integer days;
-    private Boolean isSelect;
-}

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

@@ -3,7 +3,7 @@ package com.xxfc.platform.vehicle.rest;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.biz.VehicleModelCalendarPriceBiz;
-import com.xxfc.platform.vehicle.pojo.vo.VehicleModelCalendarPriceVo;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleModelCalendarPriceDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -30,11 +30,11 @@ public class VehicleModelCalendarPriceController {
 
      @ApiOperation("返回车型日历价格")
      @GetMapping("/list/vehicle_model/calendar_price/{vehicleModelId}/{type}")
-     public ObjectRestResponse<VehicleModelCalendarPriceVo> listVehicleModelCalendarPriceByDateAndVehicleModelId(@RequestParam(value = "start",required = false) Date startDate,
+     public ObjectRestResponse<VehicleModelCalendarPriceDTO> listVehicleModelCalendarPriceByDateAndVehicleModelId(@RequestParam(value = "start",required = false) Date startDate,
                                                                                                                  @RequestParam(value = "end",required = false) Date endDate,
                                                                                                                  @PathVariable(value = "vehicleModelId") Integer vehicleModelId,
                                                                                                                  AppUserDTO appUserDTO){
-          List<VehicleModelCalendarPriceVo> vehicleModelCalendarPriceVos = vehicleModelCalendarPriceBiz.listVehicleModelCalendarPriceByDateAndVehicleModelIdAndUserId(startDate,endDate,vehicleModelId,appUserDTO.getUserid());
+          List<VehicleModelCalendarPriceDTO> vehicleModelCalendarPriceVos = vehicleModelCalendarPriceBiz.listVehicleModelCalendarPriceByDateAndVehicleModelIdAndUserId(startDate,endDate,vehicleModelId,appUserDTO.getUserid());
           return ObjectRestResponse.succ(vehicleModelCalendarPriceVos);
      }
 }