fix bug

@@ -553,52 +553,68 @@ public class OrderDbDTO {
     private Integer id;
     private Integer id;
 
 
     @ApiModelProperty(value = "需要修改菜品详情 id")
     @ApiModelProperty(value = "需要修改菜品详情 id")
-    private Boolean shouldUpdateMenuDetailId;
+    @Builder.Default
+    private Boolean shouldUpdateMenuDetailId = false;
 
 
     @ApiModelProperty(value = "菜品详情 id")
     @ApiModelProperty(value = "菜品详情 id")
-    private Integer menuDetailId;
+    @Builder.Default
+    private Integer menuDetailId = 0;
 
 
     @ApiModelProperty(value = "需要修改菜品数量")
     @ApiModelProperty(value = "需要修改菜品数量")
-    private Boolean shouldUpdateCount;
+    @Builder.Default
+    private Boolean shouldUpdateCount = false;
 
 
     @ApiModelProperty(value = "菜品所点份数")
     @ApiModelProperty(value = "菜品所点份数")
-    private Integer count;
+    @Builder.Default
+    private Integer count = 0;
 
 
     @ApiModelProperty(value = "需要修改菜品所属餐别 ID")
     @ApiModelProperty(value = "需要修改菜品所属餐别 ID")
-    private Boolean shouldUpdateMealId;
+    @Builder.Default
+    private Boolean shouldUpdateMealId = false;
 
 
     @ApiModelProperty(value = "菜品所属餐别 ID")
     @ApiModelProperty(value = "菜品所属餐别 ID")
-    private Integer mealId;
+    @Builder.Default
+    private Integer mealId = 0;
 
 
     @ApiModelProperty(value = "需要修改菜品所属分类 ID")
     @ApiModelProperty(value = "需要修改菜品所属分类 ID")
-    private Boolean shouldUpdateCategoryId;
+    @Builder.Default
+    private Boolean shouldUpdateCategoryId = false;
 
 
     @ApiModelProperty(value = "菜品所属品类 ID")
     @ApiModelProperty(value = "菜品所属品类 ID")
-    private Integer categoryId;
+    @Builder.Default
+    private Integer categoryId = 0;
 
 
     @ApiModelProperty(value = "需要修改菜品sku ID")
     @ApiModelProperty(value = "需要修改菜品sku ID")
-    private Boolean shouldUpdateSkuId;
+    @Builder.Default
+    private Boolean shouldUpdateSkuId = false;
 
 
     @ApiModelProperty(value = "sku id")
     @ApiModelProperty(value = "sku id")
-    private Integer skuId;
+    @Builder.Default
+    private Integer skuId = 0;
 
 
     @ApiModelProperty(value = "需要修改菜品展示名称")
     @ApiModelProperty(value = "需要修改菜品展示名称")
-    private Boolean shouldUpdateShowName;
+    @Builder.Default
+    private Boolean shouldUpdateShowName = false;
 
 
     @ApiModelProperty(value = "菜品展示名称")
     @ApiModelProperty(value = "菜品展示名称")
-    private String showName;
+    @Builder.Default
+    private String showName = "";
 
 
     @ApiModelProperty(value = "需要修改菜品详情")
     @ApiModelProperty(value = "需要修改菜品详情")
-    private Boolean shouldUpdateMealDetailJson;
+    @Builder.Default
+    private Boolean shouldUpdateMealDetailJson = false;
 
 
     @ApiModelProperty(value = "菜品详情，菜品主料、口味、能量、脂肪、蛋白质、碳水化合物、忌口、医嘱等")
     @ApiModelProperty(value = "菜品详情，菜品主料、口味、能量、脂肪、蛋白质、碳水化合物、忌口、医嘱等")
-    private MealDetailDto mealDetailJson;
+    @Builder.Default
+    private MealDetailDto mealDetailJson = null;
 
 
     @ApiModelProperty(value = "需要修改出餐状态")
     @ApiModelProperty(value = "需要修改出餐状态")
-    private Boolean shouldUpdateServeStatus;
+    @Builder.Default
+    private Boolean shouldUpdateServeStatus = false;
 
 
     @ApiModelProperty(value = "出餐状态: 默认未出餐=1; 不出餐=2; 已出餐=3")
     @ApiModelProperty(value = "出餐状态: 默认未出餐=1; 不出餐=2; 已出餐=3")
-    private ServeStatusEnum serveStatus;
+    @Builder.Default
+    private ServeStatusEnum serveStatus = ServeStatusEnum.SERVE_NOT_START;
   }
   }
 
 
   @Data
   @Data

@@ -301,7 +301,7 @@ public class OrderServiceImpl implements OrderService {
             .adjustSkuRemark(d.getAdjustSkuRemark())
             .adjustSkuRemark(d.getAdjustSkuRemark())
             .enterpriseId(d.getEnterpriseId())
             .enterpriseId(d.getEnterpriseId())
             .skuId(d.getSkuId())
             .skuId(d.getSkuId())
-            .serveStatus(d.getserveStatus())
+            .serveStatus(d.getServeStatus())
             .creationSource(d.getCreationSource().getNumber())
             .creationSource(d.getCreationSource().getNumber())
             .createdBy(d.getCreatedBy())
             .createdBy(d.getCreatedBy())
             .createdAt(DateUtil.formatDate(d.getCreatedAt()))
             .createdAt(DateUtil.formatDate(d.getCreatedAt()))

+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "com.infoloop.tianting.enterpriseresourcetagservice";
+option java_outer_classname = "TiantingEnterpriseResourceTagServiceProto";
+option objc_class_prefix = "OP";
+package proto;
+
+service EnterpriseResourceTagServiceRpc {
+  rpc GetTagById (SingleResourceTagGetRequest) returns (SingleResourceTagGetResponse) {}
+  rpc GetTagsByIds (ResourceTagsGetByIdsRequest) returns (ResourceTagsGetByIdsResponse) {}
+  rpc GetAllTags (ResourceTagsGetAllRequest) returns (ResourceTagsGetAllResponse) {}
+  rpc GetUserResources (UserTagsAndResourcesGetRequest) returns (UserTagsAndResourcesGetResponse) {}
+  rpc GetTagsByUserId (ResourceTagsGetByUserIdRequest) returns (ResourceTagsGetByUserIdResponse) {}
+  rpc GetTagsByUserIds (ResourceTagsGetByUserIdsRequest) returns (ResourceTagsGetByUserIdsResponse) {}
+  rpc GetTagsByWarehouseId (ResourceTagsGetByWarehouseIdRequest) returns (ResourceTagsGetByWarehouseIdResponse) {}
+  rpc GetTagResources (SingleTagResourcesGetRequest) returns (SingleTagResourcesResponse) {}
+  rpc GetTagResourcesByTagIds (GetTagResourcesByTagIdsRequest) returns (SingleTagResourcesResponse) {}
+  rpc GetUsersByTagId (UsersGetByTagIdRequest) returns (UsersGetByTagIdResponse) {}
+  rpc CreateTag (TagCreationRpcRequest) returns (TagCreationRpcResponse) {}
+  rpc AddResourcesToTag (AddResourcesToTagRpcRequest) returns (AddResourcesToTagRpcResponse) {}
+}
+
+message TagCreationRpcRequest {
+  int32 subjectId = 1;
+  ResourceTagType resourceTagType = 2;
+  ResourceTagStatus status = 4;
+  string code = 5;
+  string name = 6;
+  string note = 7;
+  int32 creationSource = 9;
+  int32 createdBy = 10;
+}
+
+message TagCreationRpcResponse {
+  int32 id = 1;
+  bool isCreated = 2;
+  string errorMessage = 3;
+}
+
+message SingleResourceTagGetRequest {
+  int32 subjectId = 1;
+  int32 id = 2;
+}
+
+message ResourceTagsGetByIdsRequest {
+  int32 subjectId = 1;
+  repeated int32 ids = 2;
+  bool includeDeleted = 3;
+}
+
+message ResourceTagsGetAllRequest {
+  int32 subjectId = 1;
+  bool includeDeleted = 2;
+}
+
+enum ResourceTagType {
+  DEFAULT_RESOURCE_TAG_TYPE = 0;
+  CREATE_RESOURCE_TAG_TYPE = 1;
+}
+
+enum ResourceTagStatus {
+  UNKNOWN_RESOURCE_TAG_STATUS = 0;
+}
+
+message SingleResourceTagResponse {
+  int32 id = 1;
+  int32 subjectId = 2;
+  ResourceTagType type = 3;
+  ResourceTagStatus status = 4;
+  string code = 5;
+  string name = 6;
+  string note = 19;
+  int32 creationSource = 20;
+  int32 createdBy = 21;
+  int64 createdAt = 22;
+  int32 updateSource = 23;
+  int32 updatedBy = 24;
+  int64 updatedAt = 25;
+}
+
+message SingleResourceTagGetResponse {
+  SingleResourceTagResponse response = 1;
+}
+
+message ResourceTagsGetByIdsResponse {
+  repeated SingleResourceTagResponse responses = 1;
+}
+
+message ResourceTagsGetAllResponse {
+  repeated SingleResourceTagResponse responses = 1;
+}
+
+message SingleTagResourcesGetRequest {
+  int32 subjectId = 1;
+  int32 id = 2;
+}
+message GetTagResourcesByTagIdsRequest {
+  int32 subjectId = 1;
+  repeated  int32 ids = 2;
+}
+
+enum TagResourceType {
+  // 0 is used internally
+  UNKNOWN_RESOURCE_TYPE = 0;
+  CLIENT = 1;
+  STALL = 2;
+  SUPPLIER = 3;
+  WAREHOUSE = 4;
+  CENTRAL_PROCESSOR = 5;
+  PURCHASER = 6;
+}
+
+message TagResource {
+  TagResourceType type = 1;
+  int32 id = 2;
+}
+
+message SingleTagResourcesResponse {
+  repeated TagResource resources = 1;
+}
+
+enum SingleResourceTagCreationFailure {
+  UNKNOWN_RESOURCE_TAG_CREATION_FAILURE = 0;
+}
+
+message UserTagsAndResourcesGetRequest {
+  int32 subjectId = 1;
+  int32 userId = 3;
+}
+
+message UserTagsAndResourcesGetResponse {
+  repeated SingleResourceTagResponse tags = 1;
+  repeated int32 clientIds = 2;
+  repeated int32 stallIds = 3;
+  repeated int32 supplierIds = 4;
+  repeated int32 warehouseIds = 5;
+  repeated int32 central_processorIds = 6;
+}
+
+message ResourceTagsGetByUserIdRequest {
+  int32 subjectId = 1;
+  int32 userId = 2;
+}
+
+message ResourceTagsGetByUserIdResponse {
+  repeated SingleResourceTagResponse tags = 1;
+}
+
+message UsersGetByTagIdRequest {
+  int32 subjectId = 1;
+  int32 tagId = 2;
+}
+
+message UsersGetByTagIdResponse {
+  repeated int32 userIds = 1;
+}
+
+message UserTagsUpdateRequest {
+  int32 subjectId = 1;
+  int32 userId = 2;
+  repeated int32 tagIds = 3;
+  int32 updateSource = 4;
+  int32 updater = 5;
+}
+
+message UserTagsUpdateResponse {
+  bool isUpdated = 1;
+}
+
+message ResourceTagsGetByUserIdsRequest {
+  int32 subjectId = 1;
+  repeated int32 userIds = 2;
+}
+
+message ResourceTagsGetByWarehouseIdRequest {
+  int32 subjectId = 1;
+  int32 warehouseId = 2;
+}
+
+message TagsByUserResponse {
+  int32 userId = 1;
+  repeated SingleResourceTagResponse tags = 2;
+}
+
+message ResourceTagsGetByUserIdsResponse {
+  repeated TagsByUserResponse userTags = 1;
+}
+
+message ResourceTagsGetByWarehouseIdResponse {
+  repeated SingleResourceTagResponse tags = 1;
+}
+
+message AddResourcesToTagRpcRequest {
+  int32 enterpriseId = 1;
+  int32 tagId = 2;
+  repeated int32 resourceIds = 3;
+  TagResourceType type = 4;
+  int32 creationSource = 5;
+  int32 createdBy = 6;
+}
+
+message AddResourcesToTagRpcResponse {
+  bool isSuccess = 1;
+}
\ No newline at end of file