jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
ed5b7a02 1 parent 38cf9203

update customer param bug

Inline Side-by-side
Showing 3 changed files with 9 additions and 6 deletions
...@@ -69,7 +69,7 @@ public class LoginInterceptor extends HandlerInterceptorAdapter { ...@@ -69,7 +69,7 @@ public class LoginInterceptor extends HandlerInterceptorAdapter {
69 final var loginSource = Convert.toInt(StpUtil.getExtra(CommonConstants.LOGIN_SOURCE)); 69 final var loginSource = Convert.toInt(StpUtil.getExtra(CommonConstants.LOGIN_SOURCE));
70 if (loginSource.equals(LoginSourceEnum.CUSTOMER.getValue())) { 70 if (loginSource.equals(LoginSourceEnum.CUSTOMER.getValue())) {
71 final var loginId = StpUtil.getLoginIdAsInt(); 71 final var loginId = StpUtil.getLoginIdAsInt();
72 - final var customer = clientCustomerServiceRpcClient.getClientCustomerById(loginId); 72 + final var customer = clientCustomerServiceRpcClient.getClientCustomerById(enterpriseId, loginId);
73 if (customer == null) { 73 if (customer == null) {
74 response.setStatus(HttpStatus.FORBIDDEN.value()); 74 response.setStatus(HttpStatus.FORBIDDEN.value());
75 ResponseUtil.write(response, ResponseResult.failed(ErrorCodeEnum.VALIDATE_FAILED)); 75 ResponseUtil.write(response, ResponseResult.failed(ErrorCodeEnum.VALIDATE_FAILED));
......
...@@ -51,8 +51,12 @@ public class ClientCustomerServiceRpcClient { ...@@ -51,8 +51,12 @@ public class ClientCustomerServiceRpcClient {
51 return clientCustomerServiceRpcBlockingStub.getClientCustomerByContactNo(request); 51 return clientCustomerServiceRpcBlockingStub.getClientCustomerByContactNo(request);
52 } 52 }
53 53
54 - public GetClientCustomerByIdRpcResponse getClientCustomerById(Integer id) { 54 + public GetClientCustomerByIdRpcResponse getClientCustomerById(Integer enterpriseId, Integer id) {
55 - final var request = GetClientCustomerByIdRpcRequest.newBuilder().setId(id).build(); 55 + final var request = GetClientCustomerByIdRpcRequest.newBuilder()
56 + .setEnterpriseId(enterpriseId)
57 + .setIncludeDeleted(false)
58 + .setId(id)
59 + .build();
56 return clientCustomerServiceRpcBlockingStub.getClientCustomerById(request); 60 return clientCustomerServiceRpcBlockingStub.getClientCustomerById(request);
57 } 61 }
58 62
......
...@@ -71,7 +71,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -71,7 +71,7 @@ public class OrderServiceImpl implements OrderService {
71 public CreateOrderResponse orderCreation(OperatorCreateOrderDto operatorCreateOrderDto) { 71 public CreateOrderResponse orderCreation(OperatorCreateOrderDto operatorCreateOrderDto) {
72 final var operatorLoginInfo = LoginContextHolder.getLoginInfo(); 72 final var operatorLoginInfo = LoginContextHolder.getLoginInfo();
73 final var operator = operatorServiceRpcClient.getCOperatorById(operatorLoginInfo.getId()); 73 final var operator = operatorServiceRpcClient.getCOperatorById(operatorLoginInfo.getId());
74 - final var customer = clientCustomerServiceRpcClient.getClientCustomerById(operatorCreateOrderDto.getCustomerId()).getResponse(); 74 + final var customer = clientCustomerServiceRpcClient.getClientCustomerById(operator.getEnterpriseId(), operatorCreateOrderDto.getCustomerId()).getResponse();
75 final var record = clientCustomerServiceRpcClient.getClientCustomerHospitalRecordsByCustomerId(customer.getEnterpriseId(), customer.getId()).getResponse(); 75 final var record = clientCustomerServiceRpcClient.getClientCustomerHospitalRecordsByCustomerId(customer.getEnterpriseId(), customer.getId()).getResponse();
76 CreateOrderDto createOrderDto = new CreateOrderDto(); 76 CreateOrderDto createOrderDto = new CreateOrderDto();
77 createOrderDto.setShouldCreateCustomerId(true); 77 createOrderDto.setShouldCreateCustomerId(true);
...@@ -83,7 +83,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -83,7 +83,7 @@ public class OrderServiceImpl implements OrderService {
83 createOrderDto.setMealTime(operatorCreateOrderDto.getMealTime()); 83 createOrderDto.setMealTime(operatorCreateOrderDto.getMealTime());
84 createOrderDto.setRemark(operatorCreateOrderDto.getRemark()); 84 createOrderDto.setRemark(operatorCreateOrderDto.getRemark());
85 createOrderDto.setCreatedBy(operatorLoginInfo.getId()); 85 createOrderDto.setCreatedBy(operatorLoginInfo.getId());
86 - createOrderDto.setClientId(customer.getClientId()); 86 + createOrderDto.setClientId(operator.getClientId());
87 createOrderDto.setAddress(record.getDepartmentName() + record.getRoomNo()); 87 createOrderDto.setAddress(record.getDepartmentName() + record.getRoomNo());
88 createOrderDto.setPayPrice(0); 88 createOrderDto.setPayPrice(0);
89 final var menu = menuServiceRpcClient.getMenuById(operator.getEnterpriseId(), 89 final var menu = menuServiceRpcClient.getMenuById(operator.getEnterpriseId(),
...@@ -91,7 +91,6 @@ public class OrderServiceImpl implements OrderService { ...@@ -91,7 +91,6 @@ public class OrderServiceImpl implements OrderService {
91 createOrderDto.setCloseTimeType( 91 createOrderDto.setCloseTimeType(
92 CloseTimeType.forNumber(menu.getOrderRuleJson().getCloseTimeType().getNumber())); 92 CloseTimeType.forNumber(menu.getOrderRuleJson().getCloseTimeType().getNumber()));
93 createOrderDto.setRoomNo(record.getRoomNo()); 93 createOrderDto.setRoomNo(record.getRoomNo());
94 - createOrderDto.setClientId(customer.getClientId());
95 createOrderDto.setCreationSource(OrderSourceEnum.STALL.getNumber()); 94 createOrderDto.setCreationSource(OrderSourceEnum.STALL.getNumber());
96 createOrderDto.setEnterpriseId(operatorLoginInfo.getEnterpriseId()); 95 createOrderDto.setEnterpriseId(operatorLoginInfo.getEnterpriseId());
97 // createOrderDto.setStallId(); 96 // createOrderDto.setStallId();
......