feat(kds): 支持按用餐时间查询餐别详情
- 修改 `/kds/mealDetails` 接口,新增请求参数 `KdsMealDetailQueryDto` - 新增 DTO 类 `KdsMealDetailQueryDto`用于接收查询条件 - 更新 `KdsService` 和 `KdsServiceImpl` 中的 `getMealDetail` 方法签名 - 根据传入的 `mealTime` 参数解析日期,替代原来固定使用当天日期逻辑
Showing
4 changed files
with
16 additions
and
5 deletions
| ... | @@ -48,8 +48,8 @@ public class KdsController { | ... | @@ -48,8 +48,8 @@ public class KdsController { |
| 48 | @ApiOperation(value = "kds获取餐别详情") | 48 | @ApiOperation(value = "kds获取餐别详情") |
| 49 | @PostMapping("/kds/mealDetails") | 49 | @PostMapping("/kds/mealDetails") |
| 50 | @ResponseStatus(HttpStatus.OK) | 50 | @ResponseStatus(HttpStatus.OK) |
| 51 | - public List<KdsMealDetailDto> getMealDetail() { | 51 | + public List<KdsMealDetailDto> getMealDetail(@Valid @RequestBody KdsDTO.KdsMealDetailQueryDto queryDto) { |
| 52 | - return kdsService.getMealDetail(); | 52 | + return kdsService.getMealDetail(queryDto); |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | } | 55 | } | ... | ... |
| ... | @@ -115,6 +115,15 @@ public class KdsDTO { | ... | @@ -115,6 +115,15 @@ public class KdsDTO { |
| 115 | @Builder | 115 | @Builder |
| 116 | @AllArgsConstructor | 116 | @AllArgsConstructor |
| 117 | @NoArgsConstructor | 117 | @NoArgsConstructor |
| 118 | + @ApiModel(description = "KdsMealDetailQueryDto") | ||
| 119 | + public static class KdsMealDetailQueryDto { | ||
| 120 | + private String mealTime; | ||
| 121 | + } | ||
| 122 | + | ||
| 123 | + @Data | ||
| 124 | + @Builder | ||
| 125 | + @AllArgsConstructor | ||
| 126 | + @NoArgsConstructor | ||
| 118 | @ApiModel(description = "KdsMealDetailDto") | 127 | @ApiModel(description = "KdsMealDetailDto") |
| 119 | public static class KdsMealDetailDto { | 128 | public static class KdsMealDetailDto { |
| 120 | private Integer mealId; | 129 | private Integer mealId; | ... | ... |
| 1 | package com.infoloop.tianting.service; | 1 | package com.infoloop.tianting.service; |
| 2 | 2 | ||
| 3 | +import com.infoloop.tianting.model.dto.KdsDTO; | ||
| 3 | import com.infoloop.tianting.model.dto.KdsDTO.KdsMealDetailDto; | 4 | import com.infoloop.tianting.model.dto.KdsDTO.KdsMealDetailDto; |
| 4 | import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationDto; | 5 | import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationDto; |
| 5 | import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationQueryDto; | 6 | import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationQueryDto; |
| ... | @@ -14,5 +15,5 @@ public interface KdsService { | ... | @@ -14,5 +15,5 @@ public interface KdsService { |
| 14 | 15 | ||
| 15 | List<KdsOrderLocationDto> getOrderDetailByLocation(KdsOrderLocationQueryDto queryDto); | 16 | List<KdsOrderLocationDto> getOrderDetailByLocation(KdsOrderLocationQueryDto queryDto); |
| 16 | 17 | ||
| 17 | - List<KdsMealDetailDto> getMealDetail(); | 18 | + List<KdsMealDetailDto> getMealDetail(KdsDTO.KdsMealDetailQueryDto queryDto); |
| 18 | } | 19 | } | ... | ... |
| ... | @@ -7,6 +7,7 @@ import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrde | ... | @@ -7,6 +7,7 @@ import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrde |
| 7 | import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderRpcResponse; | 7 | import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderRpcResponse; |
| 8 | import com.infoloop.tianting.context.LoginContextHolder; | 8 | import com.infoloop.tianting.context.LoginContextHolder; |
| 9 | import com.infoloop.tianting.model.dto.ClientInventoryDbDTO.ClientDto; | 9 | import com.infoloop.tianting.model.dto.ClientInventoryDbDTO.ClientDto; |
| 10 | +import com.infoloop.tianting.model.dto.KdsDTO; | ||
| 10 | import com.infoloop.tianting.model.dto.KdsDTO.KdsMealDetailDto; | 11 | import com.infoloop.tianting.model.dto.KdsDTO.KdsMealDetailDto; |
| 11 | import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationDetailDto; | 12 | import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationDetailDto; |
| 12 | import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationDto; | 13 | import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationDto; |
| ... | @@ -208,9 +209,9 @@ public class KdsServiceImpl implements KdsService { | ... | @@ -208,9 +209,9 @@ public class KdsServiceImpl implements KdsService { |
| 208 | } | 209 | } |
| 209 | 210 | ||
| 210 | @Override | 211 | @Override |
| 211 | - public List<KdsMealDetailDto> getMealDetail() { | 212 | + public List<KdsMealDetailDto> getMealDetail(KdsDTO.KdsMealDetailQueryDto queryDto) { |
| 212 | // 获取当日用餐的所有的订单 和 订单明细 | 213 | // 获取当日用餐的所有的订单 和 订单明细 |
| 213 | - LocalDate today = LocalDate.now(); | 214 | + LocalDate today = LocalDate.parse(queryDto.getMealTime(), DateUtil.YYYY_MM_DD); |
| 214 | LocalDateTime todayZero = today.atStartOfDay(); | 215 | LocalDateTime todayZero = today.atStartOfDay(); |
| 215 | LocalDate tomorrow = today.plusDays(1); | 216 | LocalDate tomorrow = today.plusDays(1); |
| 216 | LocalDateTime tomorrowZero = tomorrow.atStartOfDay().minusMinutes(1); | 217 | LocalDateTime tomorrowZero = tomorrow.atStartOfDay().minusMinutes(1); | ... | ... |
-
Please register or login to post a comment