fix order

@@ -195,7 +195,7 @@ public class OrderDbDTO {
     private Boolean shouldCreateOpenId;
 
     @ApiModelProperty(value = "阳光厅点餐客户 ID")
-    private String openId;
+    private String openId = "";
 
     @ApiModelProperty(value = "状态订单；待备餐=1，备餐中=2，部分出餐=3，已出餐=4，已取消=5")
     private Integer status;
@@ -207,7 +207,7 @@ public class OrderDbDTO {
     private Integer totalNum;
 
     @ApiModelProperty(value = "实际支付金额，单位为分")
-    private Integer payPrice;
+    private Integer payPrice = 0;
 
     @ApiModelProperty(value = "是否在线付费；0=未付费，1=付费")
     private Boolean onlinePay;

@@ -237,7 +237,7 @@ public class OrderServiceRpcClient {
           .setShowName(orderDetailDto.getShowName())
           .setPrice(orderDetailDto.getPrice())
           .setMealDetailJson(mealDetail)
-          .setAdjustSkuRemark(orderDetailDto.getAdjustSkuRemark())
+//          .setAdjustSkuRemark(orderDetailDto.getAdjustSkuRemark())
           .setNotServe(orderDetailDto.getNotServe())
           .setShouldCreateAdjustSkuRemark(true)
           .setShouldCreatePrice(true)

@@ -22,6 +22,7 @@ import com.infoloop.tianting.model.dto.OrderDbDTO.CreateOrderResponse;
 import com.infoloop.tianting.model.dto.OrderDbDTO.CustomerDetailDto;
 import com.infoloop.tianting.model.dto.OrderDbDTO.CustomerNotice;
 import com.infoloop.tianting.model.dto.OrderDbDTO.MealDetailDto;
+import com.infoloop.tianting.model.dto.OrderDbDTO.OperatorCreateOrderDetailDto;
 import com.infoloop.tianting.model.dto.OrderDbDTO.OperatorCreateOrderDto;
 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderAndDetailsDto;
 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailBatchUpdateDto;
@@ -73,6 +74,8 @@ public class OrderServiceImpl implements OrderService {
     final var customer = clientCustomerServiceRpcClient.getClientCustomerById(operatorCreateOrderDto.getCustomerId()).getResponse();
     final var record = clientCustomerServiceRpcClient.getClientCustomerHospitalRecordsByCustomerId(customer.getEnterpriseId(), customer.getId()).getResponse();
     CreateOrderDto createOrderDto = new CreateOrderDto();
+    createOrderDto.setShouldCreateCustomerId(true);
+    createOrderDto.setShouldCreateOpenId(false);
     createOrderDto.setCustomerId(operatorCreateOrderDto.getCustomerId());
     createOrderDto.setStallId(operatorCreateOrderDto.getStallId());
     createOrderDto.setMenuId(operatorCreateOrderDto.getMenuId());
@@ -129,7 +132,7 @@ public class OrderServiceImpl implements OrderService {
             .collect(Collectors.toList());
     final var rpcSkus = skuServiceRpcClient.getDishSkusByIds(skuIds).getResponseList();
     Integer totalSkuCount = 0;
-    for (CreateOrderDetailDto orderDetail: createOrderDto.getOrderDetailDtos()) {
+    for (OperatorCreateOrderDetailDto orderDetail: operatorCreateOrderDto.getOrderDetailDtos()) {
       totalSkuCount += orderDetail.getCount();
       final var optionalTargetMenuDetail = menuDetails.stream().filter(detail -> detail.getId() == orderDetail.getMenuDetailId()).findFirst();
       if(optionalTargetMenuDetail.isEmpty()) {

@@ -112,6 +112,7 @@ message SingleClientCustomerOrderRpcResponse {
   bool isDeleted = 32;
   bool isRead = 33;
   bool isConfirm = 34;
+  bool isAllocation = 35;
 }
 
 message GetClientCustomerOrderByIdRpcRequest {
@@ -205,6 +206,8 @@ message QueryClientCustomerOrdersByConditionRpcRequest {
   bool isRead = 43;
   bool shouldFilterIsConfirm = 44;
   bool isConfirm = 45;
+  bool shouldFilterIsAllocation = 46;
+  bool isAllocation = 47;
 }
 
 message QueryClientCustomerOrdersByConditionRpcResponse {
@@ -330,6 +333,8 @@ message ClientCustomerOrderModification {
   bool isRead = 49;
   bool shouldUpdateIsConfirm = 50;
   bool isConfirm = 51;
+  bool shouldUpdateIsAllocation = 52;
+  bool isAllocation = 53;
 }
 
 message UpdateClientCustomerOrderRpcRequest {