zhuyifan

feat(kds): 添加避免备注字段支持

- 在KdsDTO中新增avoidRemark字段
- 更新KdsServiceImpl以包含avoidRemark数据的处理
- 确保订单详情和主订单信息正确映射avoid
...@@ -30,6 +30,7 @@ public class KdsDTO { ...@@ -30,6 +30,7 @@ public class KdsDTO {
30 private Integer price; 30 private Integer price;
31 private String roomNo; 31 private String roomNo;
32 private String remark; 32 private String remark;
33 + private String avoidRemark;
33 private CustomerNotice customerNotice; 34 private CustomerNotice customerNotice;
34 private String adjustSkuRemark; 35 private String adjustSkuRemark;
35 private String mealTime; 36 private String mealTime;
...@@ -79,6 +80,7 @@ public class KdsDTO { ...@@ -79,6 +80,7 @@ public class KdsDTO {
79 private String tableCode; 80 private String tableCode;
80 private Integer totalCount; 81 private Integer totalCount;
81 private String remark; 82 private String remark;
83 + private String avoidRemark;
82 private String mealTime; 84 private String mealTime;
83 private CustomerNotice customerNotice; 85 private CustomerNotice customerNotice;
84 private Integer totalPrice; 86 private Integer totalPrice;
......
...@@ -176,6 +176,7 @@ public class KdsServiceImpl implements KdsService { ...@@ -176,6 +176,7 @@ public class KdsServiceImpl implements KdsService {
176 .count(detail.getCount()) 176 .count(detail.getCount())
177 .orderDetailId(detail.getId()) 177 .orderDetailId(detail.getId())
178 .remark(order.get().getRemark()) 178 .remark(order.get().getRemark())
179 + .avoidRemark(order.get().getAvoidRemark())
179 .orderId(order.get().getId()) 180 .orderId(order.get().getId())
180 .roomNo(order.get().getSyncRoomNo().isEmpty() ? order.get().getRoomNo() : order.get().getSyncRoomNo()) 181 .roomNo(order.get().getSyncRoomNo().isEmpty() ? order.get().getRoomNo() : order.get().getSyncRoomNo())
181 .menuId(order.get().getMenuId()) 182 .menuId(order.get().getMenuId())
...@@ -413,6 +414,7 @@ public class KdsServiceImpl implements KdsService { ...@@ -413,6 +414,7 @@ public class KdsServiceImpl implements KdsService {
413 final var kdsOrder = KdsOrderLocationDto.builder() 414 final var kdsOrder = KdsOrderLocationDto.builder()
414 .totalCount(order.getTotalNum()) 415 .totalCount(order.getTotalNum())
415 .remark(order.getRemark()) 416 .remark(order.getRemark())
417 + .avoidRemark(order.getAvoidRemark())
416 .orderId(order.getId()) 418 .orderId(order.getId())
417 .roomNo(order.getSyncRoomNo().isEmpty() ? order.getRoomNo() : order.getSyncRoomNo()) 419 .roomNo(order.getSyncRoomNo().isEmpty() ? order.getRoomNo() : order.getSyncRoomNo())
418 .tableCode(order.getTableCode()) 420 .tableCode(order.getTableCode())
......