lsd/ks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改企业联系人和企业信息

Browse Source
This commit is contained in:
sh
2025-11-20 18:31:45 +08:00
parent c348a809a5
commit 32bacfa02d
1 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java
View File

@@ -26,7 +26,7 @@ import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory; import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.framework.security.context.AuthenticationContextHolder; import com.ruoyi.framework.security.context.AuthenticationContextHolder;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import io.jsonwebtoken.lang.Collections; import org.springframework.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
@@ -34,8 +34,7 @@ import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date; import java.util.*;
import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@Service @Service
@@ -167,15 +166,9 @@ public class OauthLoginHlwService {
newUser.setNickName(wwTyInfo.getEnterprisename()); newUser.setNickName(wwTyInfo.getEnterprisename());
newUser.setIdCard(wwTyInfo.getEnterprisecode()); newUser.setIdCard(wwTyInfo.getEnterprisecode());
newUser.setRoleIds(new Long[]{parseStringToLoing(StringUtil.SYS_QY)}); newUser.setRoleIds(new Long[]{parseStringToLoing(StringUtil.SYS_QY)});
//企业联系人->现根据社会信用代码查询企业信息 //修改企业和企业联系人
Company company=companyService.queryCodeCompany(wwTyInfo.getEnterprisecode()); updateCompanyContact(wwTyInfo);
if(company!=null){
CompanyContact companyContact=new CompanyContact();
companyContact.setContactPerson(wwTyInfo.getContactperson());
companyContact.setContactPersonPhone(wwTyInfo.getContactphone());
companyContact.setCompanyId(company.getCompanyId());
companyContactService.insertContact(companyContact);
}
//移动端 //移动端
appUserParm.setPhone(wwTyInfo.getPhone()); appUserParm.setPhone(wwTyInfo.getPhone());
appUserParm.setIdCard(wwTyInfo.getEnterprisecode()); appUserParm.setIdCard(wwTyInfo.getEnterprisecode());
@@ -321,19 +314,50 @@ public class OauthLoginHlwService {
* @param wwTyInfo * @param wwTyInfo
*/ */
public void updateCompanyContact(WwTyInfo wwTyInfo) { public void updateCompanyContact(WwTyInfo wwTyInfo) {
Company company=companyService.queryCodeCompany(wwTyInfo.getEnterprisecode()); if (wwTyInfo == null) {
if(company!=null){ throw new IllegalArgumentException("参数WwTyInfo不能为空");
CompanyContact parm=new CompanyContact(); }
parm.setContactPerson(wwTyInfo.getContactperson()); String enterpriseCode = wwTyInfo.getEnterprisecode();
parm.setContactPersonPhone(wwTyInfo.getContactphone()); String enterpriseName = wwTyInfo.getEnterprisename();
parm.setCompanyId(company.getCompanyId());
List<CompanyContact> companyContacts=companyContactService.getSelectList(parm); String contactPerson = wwTyInfo.getContactperson();
if(Collections.isEmpty(companyContacts)){ String contactPhone = wwTyInfo.getContactphone();
CompanyContact companyContact=new CompanyContact();
companyContact.setContactPerson(wwTyInfo.getContactperson()); Company company = companyService.queryCodeCompany(enterpriseCode);
companyContact.setContactPersonPhone(wwTyInfo.getContactphone());
companyContact.setCompanyId(company.getCompanyId()); CompanyContact contact = new CompanyContact();
companyContactService.insertContact(companyContact); contact.setContactPerson(contactPerson);
contact.setContactPersonPhone(contactPhone);
if (Objects.nonNull(company)) {
Company updateCompany = new Company();
updateCompany.setCompanyId(company.getCompanyId());
updateCompany.setCode(enterpriseCode);
updateCompany.setName(enterpriseName);
companyService.updateCompany(updateCompany);
contact.setCompanyId(company.getCompanyId());
List<CompanyContact> existingContacts = companyContactService.getSelectList(contact);
List<CompanyContact> contactList = new ArrayList<>();
if (!CollectionUtils.isEmpty(existingContacts)) {
contact.setId(existingContacts.get(0).getId());
contactList.add(contact);
companyContactService.insertUpadteCompanyContact(contactList);
} else {
companyContactService.insertContact(contact);
}
} else {
Company newCompany = new Company();
newCompany.setCode(enterpriseCode);
newCompany.setName(enterpriseName);
companyService.insertCompany(newCompany);
if (Objects.nonNull(newCompany.getCompanyId())) {
contact.setCompanyId(newCompany.getCompanyId());
companyContactService.insertContact(contact);
} else {
throw new RuntimeException("新增企业失败：社会信用代码=" + enterpriseCode + "，未返回有效企业ID");
} }
} }
} }