suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-05-08 14:58:54 +08:00
parent 6fdc4f6c5e a2e999444a
commit a7f3ef74ba
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
View File

@@ -107,8 +107,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
@Override
public SubmitLicenseResponse getDefault(Long shopId) {
//todo 业务逻辑问题 @zhy
//1.如果已经提交过证照信息，直接查询后组装数据返回
//1.如果已经提交过证照信息，直接查询后组装数据
LicenseTransactDO result = applyLicenseMapper.selectByShopId(shopId);
SubmitLicenseResponse submitLicenseResponse = new SubmitLicenseResponse();
if (Objects.nonNull(result)){
@@ -131,19 +130,19 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
});
}
submitLicenseResponse.setProcessRecords(listByShopIdAndType);
return submitLicenseResponse;
}
//2.未查到证照信息，所以查询鲜丰的默认值
//2.未查到证照信息，所以查询鲜丰的默认值(只要鲜丰接口内有值，总是优先使用鲜丰数据)
ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId);
if (Objects.nonNull(shopInfoDO.getStoreNum())) {
GetStoreInfoByCodeResponse storeInfoCode = coolStoreStartFlowService.getStoreInfoCode(shopInfoDO.getStoreNum());
if (Objects.nonNull(storeInfoCode) && Objects.nonNull(storeInfoCode.getData()) && storeInfoCode.getCode() == 0) {
submitLicenseResponse = SubmitLicenseResponse.from(storeInfoCode);
if (Objects.nonNull(storeInfoCode.getData().getStoreDocument()) && storeInfoCode.getCode() == 0) {
//替换落库的值
submitLicenseResponse = SubmitLicenseResponse.from(storeInfoCode,submitLicenseResponse);
return submitLicenseResponse;
}
}
//3.既没有提交数据，也没有在鲜丰端查到证照信息，则返回空自由填写
return null;
return submitLicenseResponse;
}
@Override

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -312,6 +312,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId);
//线索信息
LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId());
//加盟问卷信息
MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(shopInfoDO.getLineId());
//缴费信息
FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectOne(FranchiseFeeDO.builder().shopId(shopId).build());
//线索id
@@ -371,7 +373,11 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
addSignFranchiseResponse.setPartnerName(lineInfoDO.getUsername());
}
if (Objects.nonNull(signingBaseInfoDO)){
addSignFranchiseResponse.setIdCardNo(signingBaseInfoDO.getIdCardNo());
if (JoinTypeEnum.JOIN_TYPE_ONE.getCode().equals(memberQuestionDO.getJoinType())){
addSignFranchiseResponse.setIdCardNo(signingBaseInfoDO.getIdCardNo());
}else if (JoinTypeEnum.JOIN_TYPE_TWO.getCode().equals(memberQuestionDO.getJoinType())){
addSignFranchiseResponse.setIdCardNo(signingBaseInfoDO.getBusinessLicenseCode());
}
addSignFranchiseResponse.setIdCardAddress(signingBaseInfoDO.getIdCardAddress());
}
if (Objects.nonNull(franchiseFeeDO)){