From 554b419b35d84745900da6100cb639a2e280d965 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 20 九月 2024 14:52:23 +0800
Subject: [PATCH] 添加家庭成员 手机修改为非必填
---
service-user/src/main/java/com/java110/user/cmd/owner/AuditAuthOwnerCmd.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/AuditAuthOwnerCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/AuditAuthOwnerCmd.java
index 618e054..547a800 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/AuditAuthOwnerCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/AuditAuthOwnerCmd.java
@@ -25,6 +25,7 @@
import com.java110.utils.util.ListUtil;
import org.springframework.beans.factory.annotation.Autowired;
+import java.security.acl.Owner;
import java.util.List;
/**
@@ -92,11 +93,11 @@
String memberId = "";
// todo 濡傛灉鏄笟涓�
- if(OwnerDto.OWNER_TYPE_CD_OWNER.equals(ownerAppUserDtos.get(0).getOwnerTypeCd())){
+ if (OwnerDto.OWNER_TYPE_CD_OWNER.equals(ownerAppUserDtos.get(0).getOwnerTypeCd())) {
memberId = bindOwner(ownerAppUserDtos.get(0));
- }else {
+ } else {
//todo 濡傛灉鏄垚鍛�
- memberId = bindOwnerMember(ownerAppUserDtos.get(0),userId);
+ memberId = bindOwnerMember(ownerAppUserDtos.get(0), userId);
}
@@ -119,16 +120,17 @@
/**
* 缁戝畾鎴愬憳
+ *
* @param ownerAppUserDto
* @return
*/
- private String bindOwnerMember(OwnerAppUserDto ownerAppUserDto,String userId) {
+ private String bindOwnerMember(OwnerAppUserDto ownerAppUserDto, String userId) {
// todo 鏌ョ湅 鎴垮眿鏄惁鏈変笟涓伙紝濡傛灉娌℃湁娣诲姞涓氫富
OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
ownerRoomRelDto.setRoomId(ownerAppUserDto.getRoomId());
List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
- if(ListUtil.isNull(ownerRoomRelDtos)){
+ if (ListUtil.isNull(ownerRoomRelDtos)) {
throw new CmdException("鎴垮眿鏈粦瀹氫笟涓�");
}
@@ -147,8 +149,14 @@
});
List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
- if(!ListUtil.isNull(ownerDtos)){
+ if (!ListUtil.isNull(ownerDtos)) {
return ownerDtos.get(0).getMemberId();
+ }
+
+ String personRole = OwnerDto.PERSON_ROLE_OWNER;
+
+ if (OwnerDto.OWNER_TYPE_CD_MEMBER.equals(ownerAppUserDto.getOwnerTypeCd())) {
+ personRole = OwnerDto.PERSON_ROLE_MEMBER;
}
OwnerPo ownerPo = new OwnerPo();
@@ -164,6 +172,8 @@
ownerPo.setIdCard(ownerAppUserDto.getIdCard());
ownerPo.setState(OwnerDto.STATE_FINISH);
ownerPo.setOwnerFlag(OwnerDto.OWNER_FLAG_TRUE);
+ ownerPo.setPersonType(OwnerDto.PERSON_TYPE_PERSON);
+ ownerPo.setPersonRole(personRole);
ownerPo.setAddress("鏃�");
ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
@@ -172,6 +182,7 @@
/**
* 缁戝畾涓氫富
+ *
* @param ownerAppUserDto
* @return
*/
@@ -182,13 +193,13 @@
ownerRoomRelDto.setRoomId(ownerAppUserDto.getRoomId());
List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
- if(ListUtil.isNull(ownerRoomRelDtos)){
+ if (ListUtil.isNull(ownerRoomRelDtos)) {
throw new CmdException("鎴垮眿鏈粦瀹氫笟涓�");
}
OwnerPo ownerPo = new OwnerPo();
ownerPo.setLink(ownerAppUserDto.getLink());
- // ownerPo.setName(ownerAppUserDto.getAppUserName());
+ // ownerPo.setName(ownerAppUserDto.getAppUserName());
ownerPo.setMemberId(ownerRoomRelDtos.get(0).getOwnerId());
ownerPo.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
--
Gitblit v1.8.0