wangyingyang

fix contract no user

...@@ -27,29 +27,32 @@ public class ClientCustomerServiceImpl implements ClientCustomerService { ...@@ -27,29 +27,32 @@ public class ClientCustomerServiceImpl implements ClientCustomerService {
27 27
28 @Override 28 @Override
29 public ClientCustomerDto getClientCustomerByHISCustomerId(String hisCustomerId) { 29 public ClientCustomerDto getClientCustomerByHISCustomerId(String hisCustomerId) {
30 - final var response = clientCustomerServiceRpcClient.getClientCustomerByHISCustomerId(hisCustomerId); 30 + var response = clientCustomerServiceRpcClient.getClientCustomerByHISCustomerId(hisCustomerId).getResponse();
31 + if (response.getId() == 0) {
32 + response = clientCustomerServiceRpcClient.getClientCustomerByContactNo(hisCustomerId).getResponse();
33 + }
31 return ClientCustomerDto.builder() 34 return ClientCustomerDto.builder()
32 - .id(response.getResponse().getId()) 35 + .id(response.getId())
33 - .clientId(response.getResponse().getClientId()) 36 + .clientId(response.getClientId())
34 - .enterpriseId(response.getResponse().getEnterpriseId()) 37 + .enterpriseId(response.getEnterpriseId())
35 - .age(response.getResponse().getAge()) 38 + .age(response.getAge())
36 - .height(response.getResponse().getHeight()) 39 + .height(response.getHeight())
37 - .HISCustomerId(response.getResponse().getHISCustomerId()) 40 + .HISCustomerId(response.getHISCustomerId())
38 - .identityCardNo(response.getResponse().getIdentityCardNo()) 41 + .identityCardNo(response.getIdentityCardNo())
39 - .mobile(response.getResponse().getMobile()) 42 + .mobile(response.getMobile())
40 - .name(response.getResponse().getName()) 43 + .name(response.getName())
41 - .openId(response.getResponse().getOpenId()) 44 + .openId(response.getOpenId())
42 - .sex(response.getResponse().getSex()) 45 + .sex(response.getSex())
43 - .stallId(response.getResponse().getStallId()) 46 + .stallId(response.getStallId())
44 - .weight(response.getResponse().getWeight()) 47 + .weight(response.getWeight())
45 - .isDeleted(response.getResponse().getIsDeleted()) 48 + .isDeleted(response.getIsDeleted())
46 - .birthday(DateUtil.formatDate(response.getResponse().getBirthday())) 49 + .birthday(DateUtil.formatDate(response.getBirthday()))
47 - .createdAt(DateUtil.formatDate(response.getResponse().getCreatedAt())) 50 + .createdAt(DateUtil.formatDate(response.getCreatedAt()))
48 - .createdBy(response.getResponse().getCreatedBy()) 51 + .createdBy(response.getCreatedBy())
49 - .creationSource(response.getResponse().getCreationSource()) 52 + .creationSource(response.getCreationSource())
50 - .updatedAt(DateUtil.formatDate(response.getResponse().getUpdatedAt())) 53 + .updatedAt(DateUtil.formatDate(response.getUpdatedAt()))
51 - .updateSource(response.getResponse().getUpdateSource()) 54 + .updateSource(response.getUpdateSource())
52 - .updatedBy(response.getResponse().getUpdatedBy()) 55 + .updatedBy(response.getUpdatedBy())
53 .build(); 56 .build();
54 } 57 }
55 58
......