zhuyifan

feat(order): 添加同步房间号功能并优化订单查询

......@@ -131,6 +131,10 @@ public class OrderDb extends Model<OrderDb> implements Serializable {
*/
private String roomNo;
/**
* 同步房间号
*/
private String syncRoomNo;
/**
* 点餐桌码
*/
private String tableCode;
......
......@@ -365,10 +365,12 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
if (request.getShouldFilterIsRead()) {
queryWrapper.eq(OrderDb::getIsRead, request.getIsRead());
}
if (request.getShouldFilterStatues()) {
queryWrapper.in(OrderDb::getStatus, request.getStatuesList().stream().map(OrderStatusEnum::getNumber).collect(Collectors.toList()));
}
queryWrapper.orderByDesc(OrderDb::getCreatedAt);
final var list = orderDbService.list(queryWrapper);
if (!list.isEmpty()) {
// builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(list, SingleClientCustomerOrderRpcResponse.class));
builder.addAllResponses(DbToProtoUtil.orderDbListToProtoList(list));
}
} catch (final Exception e) {
......
......@@ -599,6 +599,9 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
if (modification.getShouldUpdateIsAllocation()) {
orderDb.setIsAllocation(modification.getIsAllocation());
}
if (modification.getShouldUpdateSyncRoomNo()) {
orderDb.setSyncRoomNo(modification.getSyncRoomNo());
}
return orderDb;
}).collect(Collectors.toList());
return SpringUtil.getBean(OrderDbServiceImpl.class).updateBatchById(list);
......
......@@ -128,6 +128,10 @@ public class DbToProtoUtil {
protoBuilder.setIsAllocation(orderDb.getIsAllocation());
}
if (orderDb.getSyncRoomNo()!= null) {
protoBuilder.setSyncRoomNo(orderDb.getSyncRoomNo());
}
// 处理嵌套的CustomerNotice字段
if (orderDb.getCustomerNoticeJson()!= null) {
// Constructor<CustomerNotice> customerNoticeConstructor =
......
......@@ -138,6 +138,7 @@ message SingleClientCustomerOrderRpcResponse {
bool isRead = 33;
bool isConfirm = 34;
bool isAllocation = 35;
string syncRoomNo = 36;
}
message GetClientCustomerOrderByIdRpcRequest {
......@@ -243,6 +244,8 @@ message QueryClientCustomerOrdersByConditionRpcRequest {
bool isConfirm = 45;
bool shouldFilterIsAllocation = 46;
bool isAllocation = 47;
bool shouldFilterStatues = 48;
repeated OrderStatusEnum statues = 49;
}
message QueryClientCustomerOrdersByConditionRpcResponse {
......@@ -370,6 +373,8 @@ message ClientCustomerOrderModification {
bool isConfirm = 51;
bool shouldUpdateIsAllocation = 52;
bool isAllocation = 53;
bool shouldUpdateSyncRoomNo = 54;
string syncRoomNo = 55;
}
message UpdateClientCustomerOrderRpcRequest {
......