腕带号登录

zhuyifan
Commit d2c43a4e82fe1467810475ee9f735a0a518783dc d2c43a4e 1 parent 84dc1c7a
Showing 4 changed files with 102 additions and 7 deletions
src/main/java/com/infoloop/tianting/model/dto/PermissionDTO.java
src/main/java/com/infoloop/tianting/service/client/ClientCustomerServiceRpcClient.java
src/main/java/com/infoloop/tianting/service/impl/LoginServiceImpl.java
src/main/proto/ClientCustomerService.proto
--- a/src/main/java/com/infoloop/tianting/model/dto/PermissionDTO.java
View file @d2c43a4
+++ b/src/main/java/com/infoloop/tianting/model/dto/PermissionDTO.java
View file @d2c43a4
@@ -3,7 +3,6 @@ package com.infoloop.tianting.model.dto;
 import com.infoloop.tianting.enums.LoginSourceEnum;
 import io.swagger.annotations.ApiModel;
 import lombok.Builder;
-import lombok.Builder.Default;
 import lombok.Data;
 @Data
@@ -16,9 +15,9 @@ public class PermissionDTO {
   public static class LoginDto {
     private LoginSourceEnum loginSourceEnum;
     @Builder.Default
-    private boolean shouldLoginWithHisCustomerId = false;
+    private boolean shouldLoginWithHisCustomerNo = false;
     @Builder.Default
-    private String hisCustomerId = "";
+    private String hisCustomerNo = "";
     @Builder.Default
     private boolean shouldLoginWithOperatorPhone = false;
     @Builder.Default
--- a/src/main/java/com/infoloop/tianting/service/client/ClientCustomerServiceRpcClient.java
View file @d2c43a4
+++ b/src/main/java/com/infoloop/tianting/service/client/ClientCustomerServiceRpcClient.java
View file @d2c43a4
@@ -10,6 +10,8 @@ import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByContactNoR
 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByContactNoRpcResponse;
 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByHISCustomerIdRpcRequest;
 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByHISCustomerIdRpcResponse;
+import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByHISCustomerNoRpcRequest;
+import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByHISCustomerNoRpcResponse;
 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByIdRpcRequest;
 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByIdRpcResponse;
 import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByMobileRpcRequest;
@@ -47,6 +49,15 @@ public class ClientCustomerServiceRpcClient {
         return clientCustomerServiceRpcBlockingStub.getClientCustomerByHISCustomerId(request);
     }
+    public GetClientCustomerByHISCustomerNoRpcResponse getClientCustomerByHISCustomerNo(
+            String hisCustomerNo
+    ) {
+        final var request = GetClientCustomerByHISCustomerNoRpcRequest.newBuilder()
+                .setHISCustomerNo(hisCustomerNo)
+                .build();
+        return clientCustomerServiceRpcBlockingStub.getClientCustomerByHISCustomerNo(request);
+    }
+
     public GetClientCustomersByHISCustomerIdsRpcResponse getClientCustomersByHISCustomerIds(
             List<String> hisCustomerIds
     ) {
--- a/src/main/java/com/infoloop/tianting/service/impl/LoginServiceImpl.java
View file @d2c43a4
+++ b/src/main/java/com/infoloop/tianting/service/impl/LoginServiceImpl.java
View file @d2c43a4
@@ -40,11 +40,11 @@ public class LoginServiceImpl implements LoginService {
                     .setExtra(CommonConstants.LOGIN_SOURCE, loginDto.getLoginSourceEnum().getValue())
                     .build());
             return StpUtil.getTokenInfo();
-        } else if (loginDto.isShouldLoginWithHisCustomerId()) {
+        } else if (loginDto.isShouldLoginWithHisCustomerNo()) {
-            var customer = clientCustomerServiceRpcClient.getClientCustomerByHISCustomerId(loginDto.getHisCustomerId()).getResponse();
+            var customer = clientCustomerServiceRpcClient.getClientCustomerByHISCustomerNo(loginDto.getHisCustomerNo()).getResponse();
             if (customer.getId() == 0) {
-                // 根据hisCustomerId拿不到用户的话再去根据合同号去his查一次，即认为是月子中心客户
+                // 根据hisCustomerNo拿不到用户的话再去根据合同号去his查一次，即认为是月子中心客户
-                customer = clientCustomerServiceRpcClient.getClientCustomerByContactNo(loginDto.getHisCustomerId()).getResponse();
+                customer = clientCustomerServiceRpcClient.getClientCustomerByContactNo(loginDto.getHisCustomerNo()).getResponse();
                 if (customer.getId() == 0) {
                     throw ClientEndExceptions.IncorrectRequestValue.build(ErrorCodeEnum.VALIDATE_FAILED.name());
                 } else {
--- a/src/main/proto/ClientCustomerService.proto
View file @d2c43a4
+++ b/src/main/proto/ClientCustomerService.proto
View file @d2c43a4
@@ -13,6 +13,8 @@ service ClientCustomerServiceRpc {
   rpc GetClientCustomerById (GetClientCustomerByIdRpcRequest) returns (GetClientCustomerByIdRpcResponse) {}
   //HIS客户
   rpc GetClientCustomerByHISCustomerId (GetClientCustomerByHISCustomerIdRpcRequest) returns (GetClientCustomerByHISCustomerIdRpcResponse) {}
+  //腕带号获取客户
+  rpc GetClientCustomerByHISCustomerNo (GetClientCustomerByHISCustomerNoRpcRequest) returns (GetClientCustomerByHISCustomerNoRpcResponse) {}
   //HIS客户
   rpc GetClientCustomersByHISCustomerIds (GetClientCustomersByHISCustomerIdsRpcRequest) returns (GetClientCustomersByHISCustomerIdsRpcResponse) {}
   //月子中心客户
@@ -52,6 +54,11 @@ service ClientCustomerServiceRpc {
   rpc BatchCreateClientCustomerLabelRefs (BatchCreateClientCustomerLabelRefsRpcRequest) returns (BatchCreateClientCustomerLabelRefsRpcResponse) {}
   rpc DeleteClientCustomerLabelRefsByIds (DeleteClientCustomerLabelRefsByIdsRpcRequest) returns (DeleteClientCustomerLabelRefsRpcResponse) {}
   rpc DeleteClientCustomerLabelRefsByLabelIds (DeleteClientCustomerLabelRefsByLabelIdsRpcRequest) returns (DeleteClientCustomerLabelRefsByLabelIdsRpcResponse) {}
+
+  //客户操作记录
+  rpc QueryClientCustomerOperationRecordsByCondition (QueryClientCustomerOperationRecordsByConditionRpcRequest) returns (QueryClientCustomerOperationRecordsByConditionRpcResponse) {}
+  rpc CreateClientCustomerOperationRecord (CreateClientCustomerOperationRecordRpcRequest) returns (CreateClientCustomerOperationRecordRpcResponse) {}
+  rpc BatchCreateClientCustomerOperationRecords (BatchCreateClientCustomerOperationRecordsRpcRequest) returns (BatchCreateClientCustomerOperationRecordsRpcResponse) {}
 }
 enum ClientCustomerSexEnum {
@@ -82,6 +89,7 @@ message SingleClientCustomerRpcResponse {
   bool isDeleted = 19;
   int32 stallId = 20;
   string openId = 21;
+  string HISCustomerNo = 22;
 }
 message GetClientCustomerByIdRpcRequest {
@@ -102,6 +110,14 @@ message GetClientCustomerByHISCustomerIdRpcResponse {
   SingleClientCustomerRpcResponse response = 1;
 }
+message GetClientCustomerByHISCustomerNoRpcRequest {
+  string HISCustomerNo = 1;
+}
+
+message GetClientCustomerByHISCustomerNoRpcResponse {
+  SingleClientCustomerRpcResponse response = 1;
+}
+
 message GetClientCustomersByHISCustomerIdsRpcRequest {
   repeated string HISCustomerIds = 1;
 }
@@ -200,6 +216,8 @@ message ClientCustomerCreation{
   int32 stallId = 16;
   bool shouldCreateOpenId = 17;
   string openId = 18;
+  bool shouldCreateHISCustomerNo = 19;
+  string HISCustomerNo = 20;
 }
 message CreateClientCustomerRpcRequest {
@@ -598,3 +616,70 @@ message DeleteClientCustomerLabelRefsByLabelIdsRpcRequest {
 message DeleteClientCustomerLabelRefsByLabelIdsRpcResponse {
   bool isDeleted = 1;
 }
+
+enum ClientCustomerOperationRecordTypeEnum {
+  CLIENT_CUSTOMER_OPERATION_RECORD_TYPE_UNKNOWN = 0;
+  CLIENT_CUSTOMER_OPERATION_RECORD_TYPE_CREATE = 1;
+  CLIENT_CUSTOMER_OPERATION_RECORD_TYPE_UPDATE = 2;
+  CLIENT_CUSTOMER_OPERATION_RECORD_TYPE_BIND_MENUS = 3;
+  CLIENT_CUSTOMER_OPERATION_RECORD_TYPE_LEAVE_HOSPITAL = 4;
+}
+
+message SingleClientCustomerOperationRecordRpcResponse {
+  int32 id = 1;
+  int32 enterpriseId = 2;
+  int32 clientCustomerId = 3;
+  ClientCustomerOperationRecordTypeEnum type = 4;
+  string originalJson = 5;
+  string adjustJson = 6;
+  string operator = 7;
+  int32 createdBy = 8;
+  int64 createdAt = 9;
+  int32 creationSource = 10;
+}
+
+message QueryClientCustomerOperationRecordsByConditionRpcRequest {
+  int32 enterpriseId = 1;
+  bool shouldFilterClientCustomerIds = 2;
+  repeated int32 clientCustomerIds = 3;
+  bool shouldFilterType = 4;
+  ClientCustomerOperationRecordTypeEnum type = 5;
+}
+
+message QueryClientCustomerOperationRecordsByConditionRpcResponse {
+  repeated SingleClientCustomerOperationRecordRpcResponse responses = 1;
+}
+
+message ClientCustomerOperationRecordCreation{
+  int32 clientCustomerId = 1;
+  ClientCustomerOperationRecordTypeEnum type = 2;
+  bool shouldCreateOriginalJson = 3;
+  string originalJson = 4;
+  bool shouldCreateAdjustJson = 5;
+  string adjustJson = 6;
+  string operator = 7;
+}
+
+message CreateClientCustomerOperationRecordRpcRequest {
+  ClientCustomerOperationRecordCreation creation = 1;
+  int32 enterpriseId = 2;
+  int32 createdBy = 3;
+  int32 creationSource = 4;
+}
+
+message CreateClientCustomerOperationRecordRpcResponse {
+  int32 id = 1;
+  bool isCreated = 2;
+}
+
+message BatchCreateClientCustomerOperationRecordsRpcRequest {
+  repeated ClientCustomerOperationRecordCreation creations = 1;
+  int32 enterpriseId = 2;
+  int32 createdBy = 3;
+  int32 creationSource = 4;
+}
+
+message BatchCreateClientCustomerOperationRecordsRpcResponse {
+  repeated int32 ids = 1;
+  bool isCreated = 2;
+}