diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/MemberInfo.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/MemberInfo.java index d27d1673..f0b25aff 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/MemberInfo.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/MemberInfo.java @@ -25,9 +25,6 @@ public class MemberInfo implements Serializable { /**真实姓名*/ @ApiModelProperty(value = "真实姓名") private String realname; - /**单位全称*/ - @ApiModelProperty(value = "单位全称") - private String companyName; /**联系人*/ @ApiModelProperty(value = "联系人") private String liaisonMan; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index b6d2b52b..632770d8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -12,9 +12,12 @@ import com.jero.common.enums.ManagementMessageEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.service.SendMessageService; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.company.common.PayCompanyManagementCommon; +import com.jero.company.common.PayContactsManagementCommon; +import com.jero.company.entity.MemberInfo; import com.jero.company.entity.PayCompanyAndContactsManagement; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; @@ -240,13 +243,21 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl queryPayContactsManagementNew = new LambdaQueryWrapper<>(); + queryPayContactsManagementNew.eq(PayContactsManagement::getCompanyId,listPayCompanyManagement.get(0).getId()); + queryPayContactsManagementNew.eq(PayContactsManagement::getRoleCode,PayCompanyManagementCommon.ROLE_CODE2); + List listPayContactsManagementNew = payContactsManagementService.list(queryPayContactsManagementNew); + // 已经存在会员用户,变更会员用户 + if(!CollectionUtils.isEmpty(listPayContactsManagementNew) + && !Objects.equals(listPayContactsManagementNew.get(0).getPhone(),PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone()))){ + LambdaUpdateWrapper updatePayContactsManagement = new LambdaUpdateWrapper<>(); + updatePayContactsManagement.eq(PayContactsManagement::getId,listPayContactsManagementNew.get(0).getId()); + updatePayContactsManagement.set(PayContactsManagement::getRoleCode,PayContactsManagementCommon.ROLE_CODE1); + payContactsManagementService.update(updatePayContactsManagement); + } payContactsManagement.setCompanyId(listPayCompanyManagement.get(0).getId()); payContactsManagement.setId(listPayContactsManagement.get(0).getId()); payContactsManagementService.contactsEdit(payContactsManagement);