jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
3d0eb933 1 parent 12a7d7e9

ifx kds

Expand all
Inline Side-by-side
Showing 7 changed files with 43 additions and 8 deletions
No preview for this file type
...@@ -4,6 +4,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport; ...@@ -4,6 +4,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
4 import com.infoloop.tianting.model.dto.ClientLabelDTO; 4 import com.infoloop.tianting.model.dto.ClientLabelDTO;
5 import com.infoloop.tianting.model.dto.ClientLabelDTO.LabelDto; 5 import com.infoloop.tianting.model.dto.ClientLabelDTO.LabelDto;
6 import com.infoloop.tianting.model.dto.KdsDTO; 6 import com.infoloop.tianting.model.dto.KdsDTO;
7 +import com.infoloop.tianting.model.dto.KdsDTO.KdsMealDetailDto;
7 import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationDto; 8 import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationDto;
8 import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderSkuDto; 9 import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderSkuDto;
9 import com.infoloop.tianting.service.KdsService; 10 import com.infoloop.tianting.service.KdsService;
...@@ -45,4 +46,11 @@ public class KdsController { ...@@ -45,4 +46,11 @@ public class KdsController {
45 return kdsService.getOrderDetailByLocation(queryDto); 46 return kdsService.getOrderDetailByLocation(queryDto);
46 } 47 }
47 48
49 + @ApiOperation(value = "kds获取餐别详情")
50 + @PostMapping("/kds/mealDetails")
51 + @ResponseStatus(HttpStatus.OK)
52 + public List<KdsMealDetailDto> getMealDetail() {
53 + return kdsService.getMealDetail();
54 + }
55 +
48 } 56 }
......
...@@ -29,6 +29,7 @@ public class KdsDTO { ...@@ -29,6 +29,7 @@ public class KdsDTO {
29 private String remark; 29 private String remark;
30 private CustomerNotice customerNotice; 30 private CustomerNotice customerNotice;
31 private String adjustSkuRemark; 31 private String adjustSkuRemark;
32 + private String mealTime;
32 } 33 }
33 34
34 @Data 35 @Data
...@@ -51,6 +52,7 @@ public class KdsDTO { ...@@ -51,6 +52,7 @@ public class KdsDTO {
51 @ApiModel(description = "KdsOrderSkuDto") 52 @ApiModel(description = "KdsOrderSkuDto")
52 public static class KdsOrderSkuDto { 53 public static class KdsOrderSkuDto {
53 private String showName; 54 private String showName;
55 + private String skuCode;
54 private Integer totalCount; 56 private Integer totalCount;
55 private List<KdsOrderSkuDetailDto> orderList; 57 private List<KdsOrderSkuDetailDto> orderList;
56 } 58 }
...@@ -66,6 +68,7 @@ public class KdsDTO { ...@@ -66,6 +68,7 @@ public class KdsDTO {
66 private String tableCode; 68 private String tableCode;
67 private Integer totalCount; 69 private Integer totalCount;
68 private String remark; 70 private String remark;
71 + private String mealTime;
69 private CustomerNotice customerNotice; 72 private CustomerNotice customerNotice;
70 private List<KdsOrderLocationDetailDto> orderDetailList; 73 private List<KdsOrderLocationDetailDto> orderDetailList;
71 } 74 }
...@@ -77,7 +80,7 @@ public class KdsDTO { ...@@ -77,7 +80,7 @@ public class KdsDTO {
77 @ApiModel(description = "KdsOrderSkuDto") 80 @ApiModel(description = "KdsOrderSkuDto")
78 public static class KdsOrderSkuQueryDto { 81 public static class KdsOrderSkuQueryDto {
79 private ServeStatusEnum serveStatus; 82 private ServeStatusEnum serveStatus;
80 - private Integer categoryId; 83 + private Integer mealId;
81 } 84 }
82 85
83 @Data 86 @Data
...@@ -87,6 +90,17 @@ public class KdsDTO { ...@@ -87,6 +90,17 @@ public class KdsDTO {
87 @ApiModel(description = "KdsOrderLocationQueryDto") 90 @ApiModel(description = "KdsOrderLocationQueryDto")
88 public static class KdsOrderLocationQueryDto { 91 public static class KdsOrderLocationQueryDto {
89 private OrderStatusEnum orderStatus; 92 private OrderStatusEnum orderStatus;
90 - private Integer categoryId; 93 + private Integer mealId;
94 + }
95 +
96 + @Data
97 + @Builder
98 + @AllArgsConstructor
99 + @NoArgsConstructor
100 + @ApiModel(description = "KdsMealDetailDto")
101 + public static class KdsMealDetailDto {
102 + private Integer mealId;
103 + private String mealName;
104 + private Integer totalCount;
91 } 105 }
92 } 106 }
......
...@@ -562,9 +562,7 @@ public class OrderDbDTO { ...@@ -562,9 +562,7 @@ public class OrderDbDTO {
562 @ToString 562 @ToString
563 @ApiModel(description = "批量修改菜品细节信息") 563 @ApiModel(description = "批量修改菜品细节信息")
564 public static class OrderDetailBatchUpdateDto { 564 public static class OrderDetailBatchUpdateDto {
565 - private Integer updatedBy;
566 private OrderSourceEnum updatedSource; 565 private OrderSourceEnum updatedSource;
567 - private Integer enterpriseId;
568 private List<OrderDetailUpdateDto> details; 566 private List<OrderDetailUpdateDto> details;
569 } 567 }
570 568
......
1 package com.infoloop.tianting.service; 1 package com.infoloop.tianting.service;
2 2
3 +import com.infoloop.tianting.model.dto.KdsDTO.KdsMealDetailDto;
3 import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationDto; 4 import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationDto;
4 import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationQueryDto; 5 import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationQueryDto;
5 import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderSkuDto; 6 import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderSkuDto;
...@@ -11,4 +12,6 @@ public interface KdsService { ...@@ -11,4 +12,6 @@ public interface KdsService {
11 List<KdsOrderSkuDto> getOrderDetailBySku(KdsOrderSkuQueryDto queryDto); 12 List<KdsOrderSkuDto> getOrderDetailBySku(KdsOrderSkuQueryDto queryDto);
12 13
13 List<KdsOrderLocationDto> getOrderDetailByLocation(KdsOrderLocationQueryDto queryDto); 14 List<KdsOrderLocationDto> getOrderDetailByLocation(KdsOrderLocationQueryDto queryDto);
15 +
16 + List<KdsMealDetailDto> getMealDetail();
14 } 17 }
......
...@@ -28,6 +28,7 @@ import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrde ...@@ -28,6 +28,7 @@ import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrde
28 import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderRpcResponse; 28 import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderRpcResponse;
29 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcRequest; 29 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcRequest;
30 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcResponse; 30 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcResponse;
31 +import com.infoloop.tianting.context.LoginContextHolder;
31 import com.infoloop.tianting.enums.OrderTypeEnum; 32 import com.infoloop.tianting.enums.OrderTypeEnum;
32 import com.infoloop.tianting.model.common.PageResult; 33 import com.infoloop.tianting.model.common.PageResult;
33 import com.infoloop.tianting.model.dto.OrderDbDTO.CreateOrderDetailDto; 34 import com.infoloop.tianting.model.dto.OrderDbDTO.CreateOrderDetailDto;
...@@ -39,6 +40,7 @@ import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto; ...@@ -39,6 +40,7 @@ import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto;
39 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByPaginationDto; 40 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByPaginationDto;
40 import com.infoloop.tianting.model.dto.OrderDbDTO.UpdateOrderDto; 41 import com.infoloop.tianting.model.dto.OrderDbDTO.UpdateOrderDto;
41 import io.swagger.models.auth.In; 42 import io.swagger.models.auth.In;
43 +import java.time.LocalDate;
42 import java.time.ZoneOffset; 44 import java.time.ZoneOffset;
43 import java.util.ArrayList; 45 import java.util.ArrayList;
44 import java.util.List; 46 import java.util.List;
...@@ -120,6 +122,7 @@ public class OrderServiceRpcClient { ...@@ -120,6 +122,7 @@ public class OrderServiceRpcClient {
120 122
121 public BatchUpdateClientCustomerOrderDetailsRpcResponse batchUpdateClientCustomerOrderDetails( 123 public BatchUpdateClientCustomerOrderDetailsRpcResponse batchUpdateClientCustomerOrderDetails(
122 OrderDetailBatchUpdateDto orderDetailBatchUpdateDto) { 124 OrderDetailBatchUpdateDto orderDetailBatchUpdateDto) {
125 + final var operatorLoginInfo = LoginContextHolder.getLoginInfo();
123 final var modifications = orderDetailBatchUpdateDto.getDetails().stream().map( d-> { 126 final var modifications = orderDetailBatchUpdateDto.getDetails().stream().map( d-> {
124 MealDetail mealDetail = MealDetail.newBuilder().build();; 127 MealDetail mealDetail = MealDetail.newBuilder().build();;
125 Integer menuDetailId = 0; 128 Integer menuDetailId = 0;
...@@ -130,7 +133,7 @@ public class OrderServiceRpcClient { ...@@ -130,7 +133,7 @@ public class OrderServiceRpcClient {
130 if (d.getShouldUpdateMenuDetailId()) { 133 if (d.getShouldUpdateMenuDetailId()) {
131 menuDetailId = d.getMenuDetailId(); 134 menuDetailId = d.getMenuDetailId();
132 final var menuDetail = menuServiceRpcClient.getMenuDetailById( 135 final var menuDetail = menuServiceRpcClient.getMenuDetailById(
133 - orderDetailBatchUpdateDto.getEnterpriseId(), menuDetailId).getResponse(); 136 + operatorLoginInfo.getEnterpriseId(), menuDetailId).getResponse();
134 mealId = menuDetail.getMealId(); 137 mealId = menuDetail.getMealId();
135 categoryId = menuDetail.getCategoryId(); 138 categoryId = menuDetail.getCategoryId();
136 skuId = menuDetail.getSkuId(); 139 skuId = menuDetail.getSkuId();
...@@ -192,8 +195,8 @@ public class OrderServiceRpcClient { ...@@ -192,8 +195,8 @@ public class OrderServiceRpcClient {
192 } 195 }
193 ).collect(Collectors.toList()); 196 ).collect(Collectors.toList());
194 final var request = BatchUpdateClientCustomerOrderDetailsRpcRequest.newBuilder() 197 final var request = BatchUpdateClientCustomerOrderDetailsRpcRequest.newBuilder()
195 - .setEnterpriseId(orderDetailBatchUpdateDto.getEnterpriseId()) 198 + .setEnterpriseId(operatorLoginInfo.getEnterpriseId())
196 - .setUpdatedBy(orderDetailBatchUpdateDto.getUpdatedBy()) 199 + .setUpdatedBy(operatorLoginInfo.getId())
197 .setUpdateSourceValue(orderDetailBatchUpdateDto.getUpdatedSource().getNumber()) 200 .setUpdateSourceValue(orderDetailBatchUpdateDto.getUpdatedSource().getNumber())
198 .addAllModifications(modifications) 201 .addAllModifications(modifications)
199 .build(); 202 .build();
...@@ -258,7 +261,7 @@ public class OrderServiceRpcClient { ...@@ -258,7 +261,7 @@ public class OrderServiceRpcClient {
258 .setMealDetailJson(mealDetail) 261 .setMealDetailJson(mealDetail)
259 // .setAdjustSkuRemark(orderDetailDto.getAdjustSkuRemark()) 262 // .setAdjustSkuRemark(orderDetailDto.getAdjustSkuRemark())
260 .setServeStatus(ServeStatusEnum.SERVE_NOT_START) 263 .setServeStatus(ServeStatusEnum.SERVE_NOT_START)
261 - .setShouldCreateAdjustSkuRemark(true) 264 +// .setShouldCreateAdjustSkuRemark(true)
262 .setShouldCreatePrice(true) 265 .setShouldCreatePrice(true)
263 .setShouldCreateMealDetailJson(true) 266 .setShouldCreateMealDetailJson(true)
264 .setSkuId(orderDetailDto.getSkuId()) 267 .setSkuId(orderDetailDto.getSkuId())
...@@ -270,10 +273,19 @@ public class OrderServiceRpcClient { ...@@ -270,10 +273,19 @@ public class OrderServiceRpcClient {
270 .addAllDoctors(createOrderDto.getCustomerNoticeJson().getDoctors()) 273 .addAllDoctors(createOrderDto.getCustomerNoticeJson().getDoctors())
271 .build(); 274 .build();
272 275
276 + //判断用餐时间是否是当天
277 + final var mealDate = createOrderDto.getMealTime().toLocalDate();
278 + final var todayDate = LocalDate.now();
279 + OrderStatusEnum orderStatus = OrderStatusEnum.TO_PREPARE;
280 + if (mealDate.equals(todayDate)) {
281 + orderStatus = OrderStatusEnum.PREPARING;
282 + }
283 +
273 final var creation = ClientCustomerOrderCreation.newBuilder() 284 final var creation = ClientCustomerOrderCreation.newBuilder()
274 .setShouldCreateCustomerId(createOrderDto.getShouldCreateCustomerId()) 285 .setShouldCreateCustomerId(createOrderDto.getShouldCreateCustomerId())
275 .setCustomerId(createOrderDto.getCustomerId()) 286 .setCustomerId(createOrderDto.getCustomerId())
276 .setStallId(createOrderDto.getStallId()) 287 .setStallId(createOrderDto.getStallId())
288 + .setStatus(orderStatus)
277 .setAddress(createOrderDto.getAddress()) 289 .setAddress(createOrderDto.getAddress())
278 .setClientId(createOrderDto.getClientId()) 290 .setClientId(createOrderDto.getClientId())
279 .setShouldCreateOpenId(createOrderDto.getShouldCreateOpenId()) 291 .setShouldCreateOpenId(createOrderDto.getShouldCreateOpenId())
......