From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index aafffd6..715ab5c 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -194,6 +194,12 @@
.eq(SystemUser::getUsername,company.getUsername()))>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ櫥褰曡处鍙峰凡瀛樺湪锛岃鏇存柊閲嶈瘯~");
}
+ if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted,Boolean.TRUE)
+ .eq(SystemUser::getMobile,company.getPhone()))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ユ墜鏈哄彿宸插瓨鍦紝璇锋洿鎹㈤噸璇晘");
+ }
+
SystemUser user = new SystemUser();
user.setUsername(company.getUsername());
// 鐢熸垚瀵嗙爜鐩�
@@ -205,6 +211,7 @@
user.setFixed(Boolean.TRUE);
user.setDeleted(Boolean.FALSE);
user.setCompanyId(company.getId());
+ user.setRealname(company.getLegalName());
user.setMobile(company.getPhone());
user.setCreateUser(company.getCreator());
user.setCreateTime(company.getCreateDate());
@@ -216,6 +223,12 @@
.eq(SystemUser::getDeleted,Boolean.TRUE)
.eq(SystemUser::getUsername,company.getUsername()))>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ櫥褰曡处鍙峰凡瀛樺湪锛岃鏇存柊閲嶈瘯~");
+ }
+ if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted,Boolean.TRUE)
+ .ne(SystemUser::getUsername,company.getUsername())
+ .eq(SystemUser::getMobile,company.getPhone()))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ユ墜鏈哄彿宸插瓨鍦紝璇锋洿鏂伴噸璇晘");
}
SystemUser model = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getDeleted,Boolean.TRUE)
@@ -234,10 +247,12 @@
user.setCompanyId(company.getId());
user.setMobile(company.getPhone());
user.setCreateUser(company.getCreator());
+ user.setRealname(company.getLegalName());
user.setCreateTime(company.getCreateDate());
user.setStatus(Constants.ZERO);
systemUserMapper.insert(user);//鎻掑叆鏂扮殑绠＄悊鍛樿处鍙�
}else{
+ model.setMobile(company.getPhone());
model.setUsername(company.getUsername());
model.setCreateUser(company.getCreator());
model.setCreateTime(company.getCreateDate());
@@ -366,14 +381,14 @@
}else {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犺惀涓氭墽鐓э紒");
}
- if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
- multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
- }else {
+// if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
+// multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
+// }else {
// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犵數瀛愮绔狅紒");
- }
+// }
if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null&& company.getIdcardImgList().size()>0){
for(Multifile f : company.getIdcardImgList()){
- multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
+ multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
}
}else {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犺韩浠借瘉鎵弿浠讹紒");
@@ -783,11 +798,12 @@
company.setIsdeleted(Constants.ZERO);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Constants.equalsInteger(company.getType(),Constants.ONE)){
- return new ArrayList<>();
+// return new ArrayList<>();
}else {
+ company.setType(Constants.ZERO);
if(Constants.equalsInteger(user.getType(),Constants.TWO)){
//濡傛灉鏄晢鎴�
- wrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.shop_id=company.id");//璁剧疆鏃犳晥璁块棶
+ wrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.company_id=company.id and c.shop_id="+user.getCompanyId());//璁剧疆鏃犳晥璁块棶
}else{
//濡傛灉鏌ヨ浼佷笟鏁版嵁
if(company.getQueryFlag() == 0){
@@ -813,7 +829,7 @@
Utils.MP.blankToNull(pageWrap.getModel());
pageWrap.getModel().setIsdeleted(Constants.ZERO);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE) {
+ if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE||Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ZERO) {
}else{
if(Constants.equalsInteger(user.getType(),Constants.TWO)){
--
Gitblit v1.9.3