jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
a45f9cf3 1 parent 4dd114c8

add contract no customer

Inline Side-by-side
Showing 3 changed files with 14 additions and 2 deletions
...@@ -6,6 +6,8 @@ import com.infoloop.tianting.clientcustomerservice.ClientCustomerLabelRefCreatio ...@@ -6,6 +6,8 @@ import com.infoloop.tianting.clientcustomerservice.ClientCustomerLabelRefCreatio
6 import com.infoloop.tianting.clientcustomerservice.ClientCustomerServiceRpcGrpc; 6 import com.infoloop.tianting.clientcustomerservice.ClientCustomerServiceRpcGrpc;
7 import com.infoloop.tianting.clientcustomerservice.DeleteClientCustomerLabelRefsByIdsRpcRequest; 7 import com.infoloop.tianting.clientcustomerservice.DeleteClientCustomerLabelRefsByIdsRpcRequest;
8 import com.infoloop.tianting.clientcustomerservice.DeleteClientCustomerLabelRefsRpcResponse; 8 import com.infoloop.tianting.clientcustomerservice.DeleteClientCustomerLabelRefsRpcResponse;
9 +import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByContactNoRpcRequest;
10 +import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByContactNoRpcResponse;
9 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByHISCustomerIdRpcRequest; 11 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByHISCustomerIdRpcRequest;
10 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByHISCustomerIdRpcResponse; 12 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByHISCustomerIdRpcResponse;
11 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByIdRpcRequest; 13 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByIdRpcRequest;
...@@ -43,6 +45,12 @@ public class ClientCustomerServiceRpcClient { ...@@ -43,6 +45,12 @@ public class ClientCustomerServiceRpcClient {
43 return clientCustomerServiceRpcBlockingStub.getClientCustomerByHISCustomerId(request); 45 return clientCustomerServiceRpcBlockingStub.getClientCustomerByHISCustomerId(request);
44 } 46 }
45 47
48 + public GetClientCustomerByContactNoRpcResponse getClientCustomerByContactNo(String contractNo) {
49 + final var request = GetClientCustomerByContactNoRpcRequest.newBuilder()
50 + .setContractNo(contractNo).build();
51 + return clientCustomerServiceRpcBlockingStub.getClientCustomerByContactNo(request);
52 + }
53 +
46 public GetClientCustomerByIdRpcResponse getClientCustomerById(Integer id) { 54 public GetClientCustomerByIdRpcResponse getClientCustomerById(Integer id) {
47 final var request = GetClientCustomerByIdRpcRequest.newBuilder().setId(id).build(); 55 final var request = GetClientCustomerByIdRpcRequest.newBuilder().setId(id).build();
48 return clientCustomerServiceRpcBlockingStub.getClientCustomerById(request); 56 return clientCustomerServiceRpcBlockingStub.getClientCustomerById(request);
......
...@@ -41,10 +41,13 @@ public class LoginServiceImpl implements LoginService { ...@@ -41,10 +41,13 @@ public class LoginServiceImpl implements LoginService {
41 return StpUtil.getTokenInfo(); 41 return StpUtil.getTokenInfo();
42 } 42 }
43 else if (loginDto.isShouldLoginWithHisCustomerId()){ 43 else if (loginDto.isShouldLoginWithHisCustomerId()){
44 - final var customer = clientCustomerServiceRpcClient.getClientCustomerByHISCustomerId( 44 + var customer = clientCustomerServiceRpcClient.getClientCustomerByHISCustomerId(
45 loginDto.getHisCustomerId()).getResponse(); 45 loginDto.getHisCustomerId()).getResponse();
46 if (customer.getId() == 0) { 46 if (customer.getId() == 0) {
47 - throw ClientEndExceptions.AuthenticationFailure.build(ErrorCodeEnum.UNAUTHORIZED.name()); 47 + customer = clientCustomerServiceRpcClient.getClientCustomerByContactNo(loginDto.getHisCustomerId()).getResponse();
48 + if (customer.getId() == 0) {
49 + throw ClientEndExceptions.AuthenticationFailure.build(ErrorCodeEnum.UNAUTHORIZED.name());
50 + }
48 } 51 }
49 StpUtil.login(customer.getId(), SaLoginModel.create() 52 StpUtil.login(customer.getId(), SaLoginModel.create()
50 .setExtra(CommonConstants.ENTERPRISE_ID, customer.getEnterpriseId()) 53 .setExtra(CommonConstants.ENTERPRISE_ID, customer.getEnterpriseId())
......
...@@ -107,6 +107,7 @@ enum DishSelectRuleEnum { ...@@ -107,6 +107,7 @@ enum DishSelectRuleEnum {
107 CHOOSE_ONE_OF_DISHES = 0;//菜品品类M选1 107 CHOOSE_ONE_OF_DISHES = 0;//菜品品类M选1
108 ADD_OR_REMOVE = 1; //随意增减 108 ADD_OR_REMOVE = 1; //随意增减
109 FIXED_QUANTITY = 2; //固定数量 109 FIXED_QUANTITY = 2; //固定数量
110 + DISHES_CATEGORY_CHOOSE_ONE = 3; //菜品品类选1
110 } 111 }
111 112
112 enum ModeOfPaymentEnum { 113 enum ModeOfPaymentEnum {
......