wangyingyang

update customer param bug

......@@ -69,7 +69,7 @@ public class LoginInterceptor extends HandlerInterceptorAdapter {
final var loginSource = Convert.toInt(StpUtil.getExtra(CommonConstants.LOGIN_SOURCE));
if (loginSource.equals(LoginSourceEnum.CUSTOMER.getValue())) {
final var loginId = StpUtil.getLoginIdAsInt();
final var customer = clientCustomerServiceRpcClient.getClientCustomerById(loginId);
final var customer = clientCustomerServiceRpcClient.getClientCustomerById(enterpriseId, loginId);
if (customer == null) {
response.setStatus(HttpStatus.FORBIDDEN.value());
ResponseUtil.write(response, ResponseResult.failed(ErrorCodeEnum.VALIDATE_FAILED));
......
......@@ -51,8 +51,12 @@ public class ClientCustomerServiceRpcClient {
return clientCustomerServiceRpcBlockingStub.getClientCustomerByContactNo(request);
}
public GetClientCustomerByIdRpcResponse getClientCustomerById(Integer id) {
final var request = GetClientCustomerByIdRpcRequest.newBuilder().setId(id).build();
public GetClientCustomerByIdRpcResponse getClientCustomerById(Integer enterpriseId, Integer id) {
final var request = GetClientCustomerByIdRpcRequest.newBuilder()
.setEnterpriseId(enterpriseId)
.setIncludeDeleted(false)
.setId(id)
.build();
return clientCustomerServiceRpcBlockingStub.getClientCustomerById(request);
}
......
......@@ -71,7 +71,7 @@ public class OrderServiceImpl implements OrderService {
public CreateOrderResponse orderCreation(OperatorCreateOrderDto operatorCreateOrderDto) {
final var operatorLoginInfo = LoginContextHolder.getLoginInfo();
final var operator = operatorServiceRpcClient.getCOperatorById(operatorLoginInfo.getId());
final var customer = clientCustomerServiceRpcClient.getClientCustomerById(operatorCreateOrderDto.getCustomerId()).getResponse();
final var customer = clientCustomerServiceRpcClient.getClientCustomerById(operator.getEnterpriseId(), operatorCreateOrderDto.getCustomerId()).getResponse();
final var record = clientCustomerServiceRpcClient.getClientCustomerHospitalRecordsByCustomerId(customer.getEnterpriseId(), customer.getId()).getResponse();
CreateOrderDto createOrderDto = new CreateOrderDto();
createOrderDto.setShouldCreateCustomerId(true);
......@@ -83,7 +83,7 @@ public class OrderServiceImpl implements OrderService {
createOrderDto.setMealTime(operatorCreateOrderDto.getMealTime());
createOrderDto.setRemark(operatorCreateOrderDto.getRemark());
createOrderDto.setCreatedBy(operatorLoginInfo.getId());
createOrderDto.setClientId(customer.getClientId());
createOrderDto.setClientId(operator.getClientId());
createOrderDto.setAddress(record.getDepartmentName() + record.getRoomNo());
createOrderDto.setPayPrice(0);
final var menu = menuServiceRpcClient.getMenuById(operator.getEnterpriseId(),
......@@ -91,7 +91,6 @@ public class OrderServiceImpl implements OrderService {
createOrderDto.setCloseTimeType(
CloseTimeType.forNumber(menu.getOrderRuleJson().getCloseTimeType().getNumber()));
createOrderDto.setRoomNo(record.getRoomNo());
createOrderDto.setClientId(customer.getClientId());
createOrderDto.setCreationSource(OrderSourceEnum.STALL.getNumber());
createOrderDto.setEnterpriseId(operatorLoginInfo.getEnterpriseId());
// createOrderDto.setStallId();
......