提现记录

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

@@ -53,16 +53,28 @@ public class VehicleModelCalendarPriceController {
         return ObjectRestResponse.succ(vehicleModelCalendarPriceVos);
     }
 
-    @GetMapping(value = "/price",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @GetMapping(value = "/price", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ObjectRestResponse<List<VehicleModelCalendarPriceDTO>> findVehicleModelCalendarPriceByDate(@RequestParam(value = "startDate") Long startDate,
-                                                                                       @RequestParam(value = "endDate") Long endDate,
-                                                                                       @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
-                                                                                       @RequestParam(value = "userId") Integer userId) {
+                                                                                                      @RequestParam(value = "endDate") Long endDate,
+                                                                                                      @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
+                                                                                                      @RequestParam(value = "userId") Integer userId) {
 
         Date startDateDay = DateUtil.beginOfDay(DateUtil.date(startDate));
-                //Date.from(startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
+        //Date.from(startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
         Date endDateDay = DateUtil.beginOfDay(DateUtil.date(endDate));
-                //Date.from(endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
+        //Date.from(endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
         return ObjectRestResponse.succ(vehicleModelCalendarPriceBiz.findVehicleModelCalendarPriceByDateAndVehilceIdAndUserId(startDateDay, endDateDay, vehicleModelId, userId));
     }
+
+    @GetMapping(value = "/app/price", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ObjectRestResponse<List<VehicleModelCalendarPriceDTO>> findVehicleModelCalendarPriceByDateForApp(@RequestParam(value = "startDate") Long startDate,
+                                                                                                            @RequestParam(value = "endDate") Long endDate,
+                                                                                                            @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
+                                                                                                            AppUserDTO appUserDTO) {
+
+        Date startDateDay = DateUtil.beginOfDay(DateUtil.date(startDate));
+        Date endDateDay = DateUtil.beginOfDay(DateUtil.date(endDate));
+        return ObjectRestResponse.succ(vehicleModelCalendarPriceBiz.findVehicleModelCalendarPriceByDateAndVehilceIdAndUserId(startDateDay, endDateDay, vehicleModelId, appUserDTO.getUserid()));
+    }
+
 }