jiujian / client-customer-order-service

Go to a project
Toggle navigation Toggle navigation pinning
jin.shuai
963f9d06 1 parent f84ceef1

bugfix

Inline Side-by-side
Showing 1 changed file with 25 additions and 0 deletions
...@@ -120,6 +120,7 @@ import java.time.LocalDateTime; ...@@ -120,6 +120,7 @@ import java.time.LocalDateTime;
120 import java.time.LocalTime; 120 import java.time.LocalTime;
121 import java.time.temporal.TemporalAdjusters; 121 import java.time.temporal.TemporalAdjusters;
122 import java.util.ArrayList; 122 import java.util.ArrayList;
123 +import java.util.Collections;
123 import java.util.List; 124 import java.util.List;
124 import java.util.function.Function; 125 import java.util.function.Function;
125 import java.util.stream.Collectors; 126 import java.util.stream.Collectors;
...@@ -170,6 +171,9 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi ...@@ -170,6 +171,9 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
170 final StreamObserver<GetMealOrdersByIdsRpcResponse> responseObserver) { 171 final StreamObserver<GetMealOrdersByIdsRpcResponse> responseObserver) {
171 final var builder = GetMealOrdersByIdsRpcResponse.newBuilder(); 172 final var builder = GetMealOrdersByIdsRpcResponse.newBuilder();
172 try { 173 try {
174 + if (request.getIdsList().isEmpty()) {
175 + builder.addAllResponses(Collections.emptyList());
176 + } else {
173 final var mealOrders = mealOrderService.listByIds(request.getIdsList()); 177 final var mealOrders = mealOrderService.listByIds(request.getIdsList());
174 if (!mealOrders.isEmpty()) { 178 if (!mealOrders.isEmpty()) {
175 for (final var mealOrder : mealOrders) { 179 for (final var mealOrder : mealOrders) {
...@@ -178,6 +182,7 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi ...@@ -178,6 +182,7 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
178 builder.addResponses(build); 182 builder.addResponses(build);
179 } 183 }
180 } 184 }
185 + }
181 } catch (final Exception e) { 186 } catch (final Exception e) {
182 log.error("getMealOrdersByIds error;", e); 187 log.error("getMealOrdersByIds error;", e);
183 responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException()); 188 responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
...@@ -393,10 +398,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi ...@@ -393,10 +398,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
393 final StreamObserver<GetMpAccountsByIdsRpcResponse> responseObserver) { 398 final StreamObserver<GetMpAccountsByIdsRpcResponse> responseObserver) {
394 final var builder = GetMpAccountsByIdsRpcResponse.newBuilder(); 399 final var builder = GetMpAccountsByIdsRpcResponse.newBuilder();
395 try { 400 try {
401 + if (request.getIdsList().isEmpty()) {
402 + builder.addAllResponses(Collections.emptyList());
403 + } else {
396 final var mealOrders = mpAccountService.listByIds(request.getIdsList()); 404 final var mealOrders = mpAccountService.listByIds(request.getIdsList());
397 if (!mealOrders.isEmpty()) { 405 if (!mealOrders.isEmpty()) {
398 builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mealOrders, SingleMpAccountRpcResponse.class)); 406 builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mealOrders, SingleMpAccountRpcResponse.class));
399 } 407 }
408 + }
400 } catch (final Exception e) { 409 } catch (final Exception e) {
401 log.error("getMpAccountsByIds error;", e); 410 log.error("getMpAccountsByIds error;", e);
402 responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException()); 411 responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
...@@ -545,10 +554,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi ...@@ -545,10 +554,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
545 final StreamObserver<GetDinersByIdsRpcResponse> responseObserver) { 554 final StreamObserver<GetDinersByIdsRpcResponse> responseObserver) {
546 final var builder = GetDinersByIdsRpcResponse.newBuilder(); 555 final var builder = GetDinersByIdsRpcResponse.newBuilder();
547 try { 556 try {
557 + if (request.getIdsList().isEmpty()) {
558 + builder.addAllResponses(Collections.emptyList());
559 + } else {
548 final var mealOrders = dinerService.listByIds(request.getIdsList()); 560 final var mealOrders = dinerService.listByIds(request.getIdsList());
549 if (!mealOrders.isEmpty()) { 561 if (!mealOrders.isEmpty()) {
550 builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mealOrders, SingleDinerRpcResponse.class)); 562 builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mealOrders, SingleDinerRpcResponse.class));
551 } 563 }
564 + }
552 } catch (final Exception e) { 565 } catch (final Exception e) {
553 log.error("getDinersByIds error;", e); 566 log.error("getDinersByIds error;", e);
554 responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException()); 567 responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
...@@ -707,10 +720,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi ...@@ -707,10 +720,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
707 final StreamObserver<GetMpAccountDinerRefsByIdsRpcResponse> responseObserver) { 720 final StreamObserver<GetMpAccountDinerRefsByIdsRpcResponse> responseObserver) {
708 final var builder = GetMpAccountDinerRefsByIdsRpcResponse.newBuilder(); 721 final var builder = GetMpAccountDinerRefsByIdsRpcResponse.newBuilder();
709 try { 722 try {
723 + if (request.getIdsList().isEmpty()) {
724 + builder.addAllResponses(Collections.emptyList());
725 + } else {
710 final var mpAccountDinerRefs = mpAccountDinerRefService.listByIds(request.getIdsList()); 726 final var mpAccountDinerRefs = mpAccountDinerRefService.listByIds(request.getIdsList());
711 if (!mpAccountDinerRefs.isEmpty()) { 727 if (!mpAccountDinerRefs.isEmpty()) {
712 builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mpAccountDinerRefs, SingleMpAccountDinerRefRpcResponse.class)); 728 builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mpAccountDinerRefs, SingleMpAccountDinerRefRpcResponse.class));
713 } 729 }
730 + }
714 } catch (final Exception e) { 731 } catch (final Exception e) {
715 log.error("getMpAccountDinerRefsByIds error;", e); 732 log.error("getMpAccountDinerRefsByIds error;", e);
716 responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException()); 733 responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
...@@ -805,10 +822,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi ...@@ -805,10 +822,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
805 final StreamObserver<GetGradeClassesByIdsRpcResponse> responseObserver) { 822 final StreamObserver<GetGradeClassesByIdsRpcResponse> responseObserver) {
806 final var builder = GetGradeClassesByIdsRpcResponse.newBuilder(); 823 final var builder = GetGradeClassesByIdsRpcResponse.newBuilder();
807 try { 824 try {
825 + if (request.getIdsList().isEmpty()) {
826 + builder.addAllResponses(Collections.emptyList());
827 + } else {
808 final var gradeClasses = gradeClassService.listByIds(request.getIdsList()); 828 final var gradeClasses = gradeClassService.listByIds(request.getIdsList());
809 if (!gradeClasses.isEmpty()) { 829 if (!gradeClasses.isEmpty()) {
810 builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(gradeClasses, SingleGradeClassRpcResponse.class)); 830 builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(gradeClasses, SingleGradeClassRpcResponse.class));
811 } 831 }
832 + }
812 } catch (final Exception e) { 833 } catch (final Exception e) {
813 log.error("getGradeClassesByIds error;", e); 834 log.error("getGradeClassesByIds error;", e);
814 responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException()); 835 responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
...@@ -1060,10 +1081,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi ...@@ -1060,10 +1081,14 @@ public class MealOrderGrpcService extends MealOrderServiceRpcGrpc.MealOrderServi
1060 final StreamObserver<GetMealMenuRecordsByIdsRpcResponse> responseObserver) { 1081 final StreamObserver<GetMealMenuRecordsByIdsRpcResponse> responseObserver) {
1061 final var builder = GetMealMenuRecordsByIdsRpcResponse.newBuilder(); 1082 final var builder = GetMealMenuRecordsByIdsRpcResponse.newBuilder();
1062 try { 1083 try {
1084 + if (request.getIdsList().isEmpty()) {
1085 + builder.addAllResponses(Collections.emptyList());
1086 + } else {
1063 final var mealMenuRecords = mealMenuRecordService.listByIds(request.getIdsList()); 1087 final var mealMenuRecords = mealMenuRecordService.listByIds(request.getIdsList());
1064 if (!mealMenuRecords.isEmpty()) { 1088 if (!mealMenuRecords.isEmpty()) {
1065 builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mealMenuRecords, SingleMealMenuRecordRpcResponse.class)); 1089 builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(mealMenuRecords, SingleMealMenuRecordRpcResponse.class));
1066 } 1090 }
1091 + }
1067 } catch (final Exception e) { 1092 } catch (final Exception e) {
1068 log.error("getMealMenuRecordsByIds error;", e); 1093 log.error("getMealMenuRecordsByIds error;", e);
1069 responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException()); 1094 responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
......