jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
3837856d 1 parent 311015f1

fix(service): 修复创建 diner时的逻辑错误

Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
...@@ -151,7 +151,9 @@ public class DinerServiceImpl implements DinerService { ...@@ -151,7 +151,9 @@ public class DinerServiceImpl implements DinerService {
151 public List<DinerVO> getClientClassDiners(SingleClientRpcResponse client, SingleGradeClassRpcResponse gradeClass, String studentNo) { 151 public List<DinerVO> getClientClassDiners(SingleClientRpcResponse client, SingleGradeClassRpcResponse gradeClass, String studentNo) {
152 final var loginInfo = LoginContextHolder.getLoginInfo(); 152 final var loginInfo = LoginContextHolder.getLoginInfo();
153 final var diners = mealOrderServiceRpcClient.queryDinersByCondition(loginInfo.getEnterpriseId(), List.of(client.getId()), List.of(gradeClass.getId()), studentNo); 153 final var diners = mealOrderServiceRpcClient.queryDinersByCondition(loginInfo.getEnterpriseId(), List.of(client.getId()), List.of(gradeClass.getId()), studentNo);
154 - return diners.stream().map(diner -> DinerVO.builder() 154 + final var mpAccountDinerRefs = mealOrderServiceRpcClient.queryMpAccountDinerRefsByCondition(loginInfo.getEnterpriseId(), List.of(loginInfo.getId()), Collections.emptyList());
155 + final var existDinerIds = mpAccountDinerRefs.stream().map(SingleMpAccountDinerRefRpcResponse::getDinerId).collect(Collectors.toSet());
156 + return diners.stream().filter(diner -> !existDinerIds.contains(diner.getId())).map(diner -> DinerVO.builder()
155 .id(diner.getId()) 157 .id(diner.getId())
156 .enterpriseId(diner.getEnterpriseId()) 158 .enterpriseId(diner.getEnterpriseId())
157 .clientId(diner.getClientId()) 159 .clientId(diner.getClientId())
......