jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
973ce828 1 parent 840a3e47

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

Inline Side-by-side
Showing 1 changed file with 3 additions and 19 deletions
...@@ -4,7 +4,6 @@ import com.infoloop.tianting.clientinventoryservice.SingleClientRpcResponse; ...@@ -4,7 +4,6 @@ import com.infoloop.tianting.clientinventoryservice.SingleClientRpcResponse;
4 import com.infoloop.tianting.context.LoginContextHolder; 4 import com.infoloop.tianting.context.LoginContextHolder;
5 import com.infoloop.tianting.exception.ClientEndExceptions; 5 import com.infoloop.tianting.exception.ClientEndExceptions;
6 import com.infoloop.tianting.exception.ErrorCodeEnum; 6 import com.infoloop.tianting.exception.ErrorCodeEnum;
7 -import com.infoloop.tianting.mealorderservice.DinerCreation;
8 import com.infoloop.tianting.mealorderservice.DinerModification; 7 import com.infoloop.tianting.mealorderservice.DinerModification;
9 import com.infoloop.tianting.mealorderservice.MpAccountDinerRefCreation; 8 import com.infoloop.tianting.mealorderservice.MpAccountDinerRefCreation;
10 import com.infoloop.tianting.mealorderservice.SingleDinerRpcResponse; 9 import com.infoloop.tianting.mealorderservice.SingleDinerRpcResponse;
...@@ -75,7 +74,9 @@ public class DinerServiceImpl implements DinerService { ...@@ -75,7 +74,9 @@ public class DinerServiceImpl implements DinerService {
75 } 74 }
76 final var singleClientRpcResponse = clientsByCodes.get(0); 75 final var singleClientRpcResponse = clientsByCodes.get(0);
77 final var diners = mealOrderServiceRpcClient.queryDinersByCondition(loginInfo.getEnterpriseId(), List.of(singleClientRpcResponse.getId()), List.of(createDinerDTO.getClassId()), createDinerDTO.getStudentNo()); 76 final var diners = mealOrderServiceRpcClient.queryDinersByCondition(loginInfo.getEnterpriseId(), List.of(singleClientRpcResponse.getId()), List.of(createDinerDTO.getClassId()), createDinerDTO.getStudentNo());
78 - if (!diners.isEmpty()) { 77 + if (diners.isEmpty()) {
78 + throw ClientEndExceptions.IncorrectRequestValue.build(ErrorCodeEnum.DINER_NOT_FOUND);
79 + }
79 if (diners.size() != 1) { 80 if (diners.size() != 1) {
80 throw ClientEndExceptions.IncorrectRequestValue.build(ErrorCodeEnum.DINER_NOT_FOUND); 81 throw ClientEndExceptions.IncorrectRequestValue.build(ErrorCodeEnum.DINER_NOT_FOUND);
81 } 82 }
...@@ -98,23 +99,6 @@ public class DinerServiceImpl implements DinerService { ...@@ -98,23 +99,6 @@ public class DinerServiceImpl implements DinerService {
98 return CreatedResult.<DinerVO>builder().id(dinerId).isCreated(mpAccountDinerRef.getIsCreated()).build(); 99 return CreatedResult.<DinerVO>builder().id(dinerId).isCreated(mpAccountDinerRef.getIsCreated()).build();
99 } 100 }
100 } 101 }
101 - final var dinerCreation = DinerCreation.newBuilder()
102 - .setClientId(singleClientRpcResponse.getId())
103 - .setClassId(createDinerDTO.getClassId())
104 - .setStudentNo(createDinerDTO.getStudentNo())
105 - .setName(createDinerDTO.getName())
106 - .build();
107 - final var dinerResponse = mealOrderServiceRpcClient.createDiner(loginInfo, dinerCreation);
108 - if (dinerResponse.getIsCreated()) {
109 - final var mpAccountDinerRefCreation = MpAccountDinerRefCreation.newBuilder()
110 - .setDinerId(dinerResponse.getId())
111 - .setAccountId(loginInfo.getId())
112 - .build();
113 - final var mpAccountDinerRef = mealOrderServiceRpcClient.createMpAccountDinerRef(loginInfo, mpAccountDinerRefCreation);
114 - log.info("createMpAccountDiner dinerId:{} mpAccountDinerRefId:{}", dinerResponse.getId(), mpAccountDinerRef.getId());
115 - }
116 - return CreatedResult.<DinerVO>builder().id(dinerResponse.getId()).isCreated(dinerResponse.getIsCreated()).build();
117 - }
118 102
119 @Override 103 @Override
120 public List<GradeClassVO> getClientGradeClasses(SingleClientRpcResponse client) { 104 public List<GradeClassVO> getClientGradeClasses(SingleClientRpcResponse client) {
......