|
@@ -39,11 +39,11 @@ import org.springframework.util.StringUtils;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
|
+import java.time.LocalDateTime;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.HashSet;
|
|
import java.util.HashSet;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Set;
|
|
import java.util.Set;
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
|
|
import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
|
|
@@ -155,6 +155,7 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
|
|
|
|
|
|
enterpriseRegister.setStatus(EnterpriseRegisterAuditStatusEnum.APPROVED.getStatus());
|
|
enterpriseRegister.setStatus(EnterpriseRegisterAuditStatusEnum.APPROVED.getStatus());
|
|
enterpriseRegister.setReason(reqVO.getReason());
|
|
enterpriseRegister.setReason(reqVO.getReason());
|
|
|
|
+ enterpriseRegister.setUpdateTime(LocalDateTime.now());
|
|
mapper.updateById(enterpriseRegister);
|
|
mapper.updateById(enterpriseRegister);
|
|
|
|
|
|
// 增加企业信息
|
|
// 增加企业信息
|
|
@@ -180,10 +181,10 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
|
|
);
|
|
);
|
|
} else {
|
|
} else {
|
|
// 如果有有效的OCR识别结果,则基于OCR识别结果创建企业业务记录
|
|
// 如果有有效的OCR识别结果,则基于OCR识别结果创建企业业务记录
|
|
- if(StringUtils.hasText(businessLicenseOcr.getName())) {
|
|
|
|
|
|
+ if (StringUtils.hasText(businessLicenseOcr.getName())) {
|
|
enterpriseRegister.setName(enterpriseRegister.getName());
|
|
enterpriseRegister.setName(enterpriseRegister.getName());
|
|
}
|
|
}
|
|
- if(StringUtils.hasText(businessLicenseOcr.getCode())) {
|
|
|
|
|
|
+ if (StringUtils.hasText(businessLicenseOcr.getCode())) {
|
|
businessLicenseOcr.setCode(enterpriseRegister.getCode());
|
|
businessLicenseOcr.setCode(enterpriseRegister.getCode());
|
|
}
|
|
}
|
|
businessService.createBussiness(enterpriseId, businessLicenseOcr);
|
|
businessService.createBussiness(enterpriseId, businessLicenseOcr);
|
|
@@ -265,6 +266,7 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
|
|
}
|
|
}
|
|
enterpriseRegister.setStatus(EnterpriseRegisterAuditStatusEnum.REJECT.getStatus());
|
|
enterpriseRegister.setStatus(EnterpriseRegisterAuditStatusEnum.REJECT.getStatus());
|
|
enterpriseRegister.setReason(reqVO.getReason());
|
|
enterpriseRegister.setReason(reqVO.getReason());
|
|
|
|
+ enterpriseRegister.setUpdateTime(LocalDateTime.now());
|
|
mapper.updateById(enterpriseRegister);
|
|
mapper.updateById(enterpriseRegister);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -283,7 +285,7 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
|
|
MdeUserDO userDO = mdeUserService.getUserByPhone(contact.getPhone());
|
|
MdeUserDO userDO = mdeUserService.getUserByPhone(contact.getPhone());
|
|
if (null == userDO) {
|
|
if (null == userDO) {
|
|
// 没有就创建
|
|
// 没有就创建
|
|
- userDO = mdeUserService.createUserIfAbsent(contact.getPhone(), getClientIP(), getTerminal().toString());
|
|
|
|
|
|
+ userDO = mdeUserService.createUserIfAbsent(contact.getPhone(), getClientIP(), getTerminal().toString());
|
|
// 表示 userDO.getId() 因为企业用户注册, 所以加积分
|
|
// 表示 userDO.getId() 因为企业用户注册, 所以加积分
|
|
pointOperateProducer.send(EventAsyncConfirmMessage.builder()
|
|
pointOperateProducer.send(EventAsyncConfirmMessage.builder()
|
|
// 给谁加,谁申请给谁加
|
|
// 给谁加,谁申请给谁加
|
|
@@ -304,8 +306,8 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
|
|
.setTemplateParams(
|
|
.setTemplateParams(
|
|
// 假设MapUtil.builder()的API允许链式调用,并且返回的是Map.Builder类型
|
|
// 假设MapUtil.builder()的API允许链式调用,并且返回的是Map.Builder类型
|
|
// 如果不是,你需要根据实际的API进行调整
|
|
// 如果不是,你需要根据实际的API进行调整
|
|
- MapUtil.<String, Object>builder()
|
|
|
|
- .put("1",MessageUtils.replace(reqVO.getName()))
|
|
|
|
|
|
+ MapUtil.<String, Object>builder()
|
|
|
|
+ .put("1", MessageUtils.replace(reqVO.getName()))
|
|
.build()
|
|
.build()
|
|
));
|
|
));
|
|
}
|
|
}
|