fix

@@ -4,24 +4,20 @@ import com.infoloop.tianting.clientcustomerorderservice.CloseTimeType;
 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum;
 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum;
 import com.infoloop.tianting.clientcustomerorderservice.ServeStatusEnum;
-import com.infoloop.tianting.menuservice.CloseTimeTypeEnum;
 import com.infoloop.tianting.model.common.PageInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import javax.validation.Valid;
-import jdk.jfr.StackTrace;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Builder.Default;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @ApiModel(description = "订单DTO")
 public class OrderDbDTO {
@@ -216,6 +212,9 @@ public class OrderDbDTO {
     @ApiModelProperty(value = "用餐日期")
     private LocalDateTime mealTime;
 
+    @ApiModelProperty(value = "桌号")
+    private String tableCode;
+
     @ApiModelProperty(value = "备注")
     private String remark;
 

@@ -516,7 +516,7 @@ public class OrderServiceRpcClient {
                 .setOpenId(createOrderDto.getOpenId())
                 .setShouldCreateRoomNo(!createOrderDto.getRoomNo().isEmpty())
                 .setRoomNo(createOrderDto.getRoomNo())
-                .setShouldCreateTableCode(createOrderDto.getOrderType().equals(OrderTypeEnum.DINE_IN.getValue()))
+                .setShouldCreateTableCode(createOrderDto.getOrderType().equals(OrderTypeEnum.DINE_IN.getValue()) || !createOrderDto.getTableCode().isEmpty())
                 .setTableCode(createOrderDto.getTableCode())
                 .setOnlinePay(createOrderDto.getOnlinePay())
                 .setShouldCreatePayStatus(createOrderDto.getOnlinePay())

@@ -95,6 +95,7 @@ public class OrderServiceImpl implements OrderService {
         createOrderDto.setShouldCreateCustomerId(true);
         createOrderDto.setShouldCreateOpenId(false);
         createOrderDto.setOpenId("");
+        createOrderDto.setTableCode(operatorCreateOrderDto.getTableCode());
         createOrderDto.setCustomerId(operatorCreateOrderDto.getCustomerId());
         createOrderDto.setStallId(operatorCreateOrderDto.getStallId());
         createOrderDto.setMenuId(operatorCreateOrderDto.getMenuId());
@@ -161,7 +162,6 @@ public class OrderServiceImpl implements OrderService {
                 .build();
         createOrderDto.setCustomerNoticeJson(customerNotice);
 
-        createOrderDto.setTableCode("");
         createOrderDto.setUpdatedBy(operatorLoginInfo.getId());
         createOrderDto.setUpdateSource(OrderSourceEnum.STALL.getNumber());
         List<CreateOrderDetailDto> orderDetailDtoList = new ArrayList<>();