fix

@@ -46,8 +46,8 @@ public class LabelController {
   @ApiOperation(value = "按类型获取标签")
   @ApiOperation(value = "按类型获取标签")
   @PostMapping("/labels")
   @PostMapping("/labels")
   @ResponseStatus(HttpStatus.OK)
   @ResponseStatus(HttpStatus.OK)
-  public List<LabelDto> getMealsByIds(@Valid @RequestBody ClientLabelDTO.QueryLabelsDto queryLabelsDto) {
-    return deliveryRuleService.getLabelsByType(queryLabelsDto);
+  public List<LabelDto> getMiniProgramLabels(@Valid @RequestBody ClientLabelDTO.QueryLabelsDto queryLabelsDto) {
+    return deliveryRuleService.getLabelsByTypes(queryLabelsDto);
   }
   }
 
 
   @ApiOperation(value = "批量创建用户绑定标签")
   @ApiOperation(value = "批量创建用户绑定标签")

@@ -37,7 +37,7 @@ public class ClientLabelDTO {
   @ApiModel(description = "查询标签 DTO")
   @ApiModel(description = "查询标签 DTO")
   public static class QueryLabelsDto {
   public static class QueryLabelsDto {
     private Integer enterpriseId;
     private Integer enterpriseId;
-    private ClientLabelTypeEnum type;
+    private List<ClientLabelTypeEnum> types;
   }
   }
 
 
   @Data
   @Data

@@ -30,6 +30,7 @@ public class KdsDTO {
     private CustomerNotice customerNotice;
     private CustomerNotice customerNotice;
     private String adjustSkuRemark;
     private String adjustSkuRemark;
     private String mealTime;
     private String mealTime;
+    private ServeStatusEnum serveStatus;
   }
   }
 
 
   @Data
   @Data

@@ -7,6 +7,8 @@ import java.util.List;
 
 
 public interface DeliveryRuleService {
 public interface DeliveryRuleService {
 
 
-  List<LabelDto> getLabelsByType(QueryLabelsDto queryLabelsDto);
+//  List<LabelDto> getLabelsByType(QueryLabelsDto queryLabelsDto);
+
+  List<LabelDto> getLabelsByTypes(QueryLabelsDto queryLabelsDto);
 
 
 }
 }

@@ -19,11 +19,11 @@ public class DeliveryRuleServiceRpcClient {
   private final TiantingDeliveryRuleServiceRpcGrpc.TiantingDeliveryRuleServiceRpcBlockingStub
   private final TiantingDeliveryRuleServiceRpcGrpc.TiantingDeliveryRuleServiceRpcBlockingStub
       deliveryRuleServiceRpcBlockingStub;
       deliveryRuleServiceRpcBlockingStub;
 
 
-  public QueryClientLabelsByConditionRpcResponse getLabelsByType(QueryLabelsDto queryLabelsDto) {
+  public QueryClientLabelsByConditionRpcResponse getLabelsByTypes(QueryLabelsDto queryLabelsDto) {
     final var request = QueryClientLabelsByConditionRpcRequest.newBuilder()
     final var request = QueryClientLabelsByConditionRpcRequest.newBuilder()
         .setEnterpriseId(queryLabelsDto.getEnterpriseId())
         .setEnterpriseId(queryLabelsDto.getEnterpriseId())
-        .setShouldFilterType(true)
-        .setType(queryLabelsDto.getType())
+        .setShouldFilterTypes(true)
+        .addAllTypes(queryLabelsDto.getTypes())
         .setIncludeDeleted(false)
         .setIncludeDeleted(false)
         .build();
         .build();
     return deliveryRuleServiceRpcBlockingStub.queryClientLabelsByCondition(request);
     return deliveryRuleServiceRpcBlockingStub.queryClientLabelsByCondition(request);

@@ -28,7 +28,7 @@ public class PayServiceClient {
 
 
   public PayResponseDto payInform(PayInformRequestDto payRequestDto) {
   public PayResponseDto payInform(PayInformRequestDto payRequestDto) {
     try {
     try {
-      String url = "http://10.2.1.166:21051/API/Microapp/CreateOrder?appid=Order0001";
+      String url = "http://10.2.5.162:21051/API/Microapp/CreateOrder?appid=Order0001";
       String clientId = "Order0001";
       String clientId = "Order0001";
       ObjectMapper objectMapper = new ObjectMapper();
       ObjectMapper objectMapper = new ObjectMapper();
       ThirdPartyPayInformRequestDto jsonData = new ThirdPartyPayInformRequestDto();
       ThirdPartyPayInformRequestDto jsonData = new ThirdPartyPayInformRequestDto();

@@ -20,9 +20,9 @@ public class DeliveryRuleServiceImpl implements DeliveryRuleService {
   private final DeliveryRuleServiceRpcClient deliveryRuleServiceRpcClient;
   private final DeliveryRuleServiceRpcClient deliveryRuleServiceRpcClient;
 
 
   @Override
   @Override
-  public List<LabelDto> getLabelsByType(QueryLabelsDto queryLabelsDto) {
+  public List<LabelDto> getLabelsByTypes(QueryLabelsDto queryLabelsDto) {
 
 
-    final var response = deliveryRuleServiceRpcClient.getLabelsByType(queryLabelsDto);
+    final var response = deliveryRuleServiceRpcClient.getLabelsByTypes(queryLabelsDto);
     return response.getResponsesList().stream().map(
     return response.getResponsesList().stream().map(
         label -> LabelDto.builder()
         label -> LabelDto.builder()
             .id(label.getId())
             .id(label.getId())

@@ -125,6 +125,7 @@ public class KdsServiceImpl implements KdsService {
                 .build())
                 .build())
             .adjustSkuRemark(detail.getAdjustSkuRemark())
             .adjustSkuRemark(detail.getAdjustSkuRemark())
             .mealTime(DateUtil.formatDate(order.get().getMealTime()))
             .mealTime(DateUtil.formatDate(order.get().getMealTime()))
+            .serveStatus(detail.getServeStatus())
             .build();
             .build();
         kdsOrders.add(kdsOrder);
         kdsOrders.add(kdsOrder);
       }
       }
@@ -199,7 +200,7 @@ public class KdsServiceImpl implements KdsService {
     List<KdsMealDetailDto> kdsMealDetailDtoList = new ArrayList<>();
     List<KdsMealDetailDto> kdsMealDetailDtoList = new ArrayList<>();
     for(Integer mealId: mealIds) {
     for(Integer mealId: mealIds) {
       final var meal = allMeals.stream().filter(m -> m.getId() == mealId).findFirst();
       final var meal = allMeals.stream().filter(m -> m.getId() == mealId).findFirst();
-      String mealName = "";
+      String mealName = "无餐别";
       if(meal.isEmpty() && mealId != 0) {
       if(meal.isEmpty() && mealId != 0) {
         continue;
         continue;
       }
       }