资质审核

This commit is contained in:
苏竹红
2024-06-21 16:41:32 +08:00
parent 8afaf7071f
commit 788c968289
19 changed files with 936 additions and 125 deletions

View File

@@ -0,0 +1,9 @@
package com.cool.store.service;
/**
* @Author suzhuhong
* @Date 2024/6/20 17:22
* @Version 1.0
*/
public interface DecorationDesignInfoService {
}

View File

@@ -0,0 +1,14 @@
package com.cool.store.service.impl;
import com.cool.store.service.DecorationDesignInfoService;
import org.springframework.stereotype.Service;
/**
* @Author suzhuhong
* @Date 2024/6/20 17:22
* @Version 1.0
*/
@Service
public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoService {
}

View File

@@ -5,6 +5,7 @@ import com.cool.store.constants.CommonConstants;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.HyPartnerUserChannelDAO;
import com.cool.store.dao.LineInfoDAO;
import com.cool.store.dao.QualificationsInfoDAO;
import com.cool.store.entity.*;
import com.cool.store.enums.*;
import com.cool.store.exception.ApiException;
@@ -77,6 +78,8 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
private UserAuthMappingService userAuthMappingService;
@Resource
private ShopService shopService;
@Resource
QualificationsInfoDAO qualificationsInfoDAO;
@Override
@@ -121,7 +124,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
return null;
}
SigningBaseInfoResponse response = SigningBaseInfoResponse.from(signingBaseInfoDO);
MemberQuestionDO byLineId = joinIntentionMapper.getByLineId(lineId);
QualificationsInfoDO byLineId = qualificationsInfoDAO.getByLineId(lineId);
response.setType(byLineId.getJoinType());
if (Objects.nonNull(signingBaseInfoDO.getAuditId())) {
LineAuditInfoDO lineAuditInfoDO = lineAuditInfoMapper.selectByPrimaryKey(signingBaseInfoDO.getAuditId());
@@ -256,9 +259,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
franchiseeDO.setProvinceCode(String.valueOf(openAreaInfoDO.getParentId()));
franchiseeDO.setCityCode(String.valueOf(openAreaInfoDO.getId()));
franchiseeDO.setOperator(user.getJobNumber());
MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(lineInfoDO.getId());
QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfoDO.getId());
//如果是企业加盟,需要传有效期和法人
if (Objects.nonNull(memberQuestionDO) && Constants.TWO_INTEGER.equals(memberQuestionDO.getJoinType())) {
if (Objects.nonNull(qualificationsInfoDO) && Constants.TWO_INTEGER.equals(qualificationsInfoDO.getJoinType())) {
SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(null, lineInfoDO.getId());
BusinessLicenseInfoVO businessLicenseInfo = aliyunService.getBusinessLicenseInfo(signingBaseInfoDO.getBusinessLicense());
franchiseeDO.setBusinessTerm(businessLicenseInfo.getValidPeriod());

View File

@@ -2,6 +2,7 @@ package com.cool.store.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.dao.LineInfoDAO;
import com.cool.store.dao.QualificationsInfoDAO;
import com.cool.store.dao.RegionAreaConfigDao;
import com.cool.store.entity.*;
import com.cool.store.enums.*;
@@ -33,6 +34,9 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
@Resource
JoinIntentionMapper joinIntentionMapper;
@Resource
QualificationsInfoDAO qualificationsInfoDAO;
@Resource
LineInfoDAO lineInfoDAO;
@@ -82,9 +86,8 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
lineInfoParam.setBigRegionId(regionId);
}
lineInfoDAO.insertOrUpdate(lineInfoParam);
MemberQuestionDO memberQuestionDO = request.toMemberQuestionDO();
memberQuestionDO.setLineId(lineInfoParam.getId());
joinIntentionMapper.insertOrUpdate(memberQuestionDO);
QualificationsInfoDO qualificationsInfoDO = request.toQualificationsInfoDO();
qualificationsInfoDAO.insertOrUpdate(qualificationsInfoDO);
Map<String, String> requestMap = new HashMap<>();
requestMap.put("partnerUsername", lineInfoParam.getUsername());
@@ -107,7 +110,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
//更新线索阶段
lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(), userId);
//更新加盟问卷信息
joinIntentionMapper.updateAuditIdByLineId(auditId, lineInfo.getId());
qualificationsInfoDAO.updateAuditIdByLineId(auditId, lineInfo.getId());
commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.INTERVIEW_APPOINTMENT_SUCCESS);
return Boolean.TRUE;
}
@@ -118,14 +121,14 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
lineInfo.setUpdateUserId(userId);
lineInfoDAO.updateLineInfo(lineInfo);
//更新加盟问卷信息
joinIntentionMapper.updateAuditIdByLineId(auditId, lineInfo.getId());
qualificationsInfoDAO.updateAuditIdByLineId(auditId, lineInfo.getId());
return Boolean.TRUE;
}
@Override
public PartnerBaseInfoVO getByLineId(Long lineId) {
LineInfoDO byLineId = lineInfoDAO.getLineInfo(lineId);
MemberQuestionDO result = joinIntentionMapper.getByLineId(lineId);
QualificationsInfoDO result = qualificationsInfoDAO.getByLineId(lineId);
if (Objects.isNull(byLineId)) {
throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);

View File

@@ -78,6 +78,8 @@ public class LineServiceImpl implements LineService {
TrainingExperienceService trainingExperienceService;
@Resource
private RegionQrcodeConfigDao regionQrcodeConfigDao;
@Resource
QualificationsInfoDAO qualificationsInfoDAO;
@Override
@@ -114,14 +116,14 @@ public class LineServiceImpl implements LineService {
result.setRejectPublicReason(lineAuditInfoDO.getRejectPublicReason());
}
MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(lineInfo.getId());
QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfo.getId());
Map<Long, HyPartnerLabelDO> userPortraitMap = deskService.getUserPortraitMap(Arrays.asList(lineInfo));
Map<Long, String> wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(Arrays.asList(lineInfo.getWantShopAreaId()));
BaseInfoVO baseInfoVO = deskService.convertToBaseInfoVO(lineInfo, userPortraitMap, wantShopAreaMap);
result.setWantShopAreaName(baseInfoVO.getWantShopAreaName());
result.setUserPortraitList(baseInfoVO.getUserPortraitList());
if (memberQuestionDO != null){
result.setJoinType(memberQuestionDO.getJoinType());
if (qualificationsInfoDO != null){
result.setJoinType(qualificationsInfoDO.getJoinType());
}
BeanUtil.copyProperties(lineInfo,result);
return result;
@@ -317,30 +319,30 @@ public class LineServiceImpl implements LineService {
@Override
public IntendProcessTotalVO getIntendProcessTotal(Long lineId) {
MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(lineId);
if (memberQuestionDO==null){
QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineId);
if (qualificationsInfoDO==null){
return null;
}
//总天数
Integer totalDays = 10;
IntendProcessTotalVO intendProcessTotalVO = new IntendProcessTotalVO();
intendProcessTotalVO.setTotalDays(totalDays);
intendProcessTotalVO.setCompletionTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.addDays(memberQuestionDO.getCreateTime(),totalDays)));
intendProcessTotalVO.setCompletionTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.addDays(qualificationsInfoDO.getCreateTime(),totalDays)));
List<Long> auditIds = new ArrayList<>();
if (memberQuestionDO.getAuditId()!=null){
auditIds.add(memberQuestionDO.getAuditId());
if (qualificationsInfoDO.getAuditId()!=null){
auditIds.add(qualificationsInfoDO.getAuditId());
}
List<LineInterviewDO> interviewList = lineInterviewDAO.getInterviewByLineId(lineId);
auditIds.addAll(interviewList.stream().filter(x->x.getAuditId()!=null).map(LineInterviewDO::getAuditId).collect(Collectors.toList()));
Map<Integer, Long> interviewDOMap = interviewList.stream().filter(x->x.getAuditId()!=null).collect(Collectors.toMap(k -> k.getInterviewType(), v -> v.getAuditId()));
interviewDOMap.put(10,memberQuestionDO.getAuditId());
interviewDOMap.put(10,qualificationsInfoDO.getAuditId());
List<LineAuditInfoDO> lineAuditInfoList = lineAuditInfoDAO.getLineAuditInfoList(auditIds);
Map<Long, Date> dateMap = lineAuditInfoList.stream().collect(Collectors.toMap(k -> k.getId(), v -> v.getCreateTime()));
LinePayDO linePay = linePayDAO.getByLineIdAndPayTypeAndShopId(lineId,PayBusinessTypeEnum.INTENT_MONEY.getCode(),null);
SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(memberQuestionDO.getPartnerId(), lineId);
SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(qualificationsInfoDO.getPartnerId(), lineId);
// LeaseBaseInfoDO trainingExperience = trainingExperienceService.getTrainingExperience(lineId);
@@ -371,7 +373,7 @@ public class LineServiceImpl implements LineService {
List<IntendProcessVO> list = new ArrayList<>();
for (WorkflowSubStageEnum workflowSubStageEnum : WorkflowSubStageEnum.values()) {
IntendProcessVO intend = getIntend(memberQuestionDO.getCreateTime(), workflowSubStageEnum);
IntendProcessVO intend = getIntend(qualificationsInfoDO.getCreateTime(), workflowSubStageEnum);
if (map.get(workflowSubStageEnum.getCode())!=null){
intend.setActualTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,map.get(workflowSubStageEnum.getCode())));
}

View File

@@ -252,14 +252,6 @@ public class PreparationServiceImpl implements PreparationService {
decorationService.getDecorationModel(shopId, null);
flushFlag = Boolean.TRUE;
}
//施工阶段
Integer Status1100 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus();
Integer Status1110 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus();
Integer Construction = collect.get(ShopSubStageEnum.SHOP_STAGE_11.getShopSubStage()).getShopSubStageStatus();
if (Status1110.equals(Construction) || Status1100.equals(Construction)) {
decorationService.getConstructionInfo(shopId);
flushFlag = Boolean.TRUE;
}
return flushFlag;
}

View File

@@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.CommonConstants;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.QualificationsInfoDAO;
import com.cool.store.dao.ShopStageInfoDAO;
import com.cool.store.entity.*;
import com.cool.store.enums.*;
@@ -83,6 +84,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
@Resource
RedisUtilPool redisUtilPool;
@Resource
QualificationsInfoDAO qualificationsInfoDAO;
@Override
@@ -377,7 +380,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
//线索信息
LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId());
//加盟问卷信息
MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(shopInfoDO.getLineId());
QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(shopInfoDO.getLineId());
//缴费信息
FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectOne(FranchiseFeeDO.builder().shopId(shopId).build());
//线索id
@@ -431,10 +434,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
if (Objects.nonNull(lineInfoDO)) {
addSignFranchiseResponse.setPartnerName(lineInfoDO.getUsername());
}
if (Objects.nonNull(signingBaseInfoDO) && Objects.nonNull(memberQuestionDO)) {
if (JoinTypeEnum.JOIN_TYPE_ONE.getCode().equals(memberQuestionDO.getJoinType())) {
if (Objects.nonNull(signingBaseInfoDO) && Objects.nonNull(qualificationsInfoDO)) {
if (JoinTypeEnum.JOIN_TYPE_ONE.getCode().equals(qualificationsInfoDO.getJoinType())) {
addSignFranchiseResponse.setIdCardNo(signingBaseInfoDO.getIdCardNo());
} else if (JoinTypeEnum.JOIN_TYPE_TWO.getCode().equals(memberQuestionDO.getJoinType())) {
} else if (JoinTypeEnum.JOIN_TYPE_TWO.getCode().equals(qualificationsInfoDO.getJoinType())) {
addSignFranchiseResponse.setIdCardNo(signingBaseInfoDO.getBusinessLicenseCode());
}
addSignFranchiseResponse.setIdCardAddress(signingBaseInfoDO.getIdCardAddress());