diff --git a/coolstore-partner-dao/src/main/resources/mapper/QualificationsInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/QualificationsInfoMapper.xml index ca7507ccf..f82e6d4e2 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/QualificationsInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/QualificationsInfoMapper.xml @@ -35,6 +35,8 @@ + + @@ -73,6 +75,7 @@ financial_manager_name, financial_manager_mobile, business_license, + unified_social_credit_code, #{request.auditId}, @@ -105,6 +108,7 @@ #{request.financialManagerName}, #{request.financialManagerMobile}, #{request.businessLicense}, + #{request.unifiedSocialCreditCode}, ON DUPLICATE KEY UPDATE @@ -138,6 +142,7 @@ financial_manager_name = #{request.financialManagerName}, financial_manager_mobile = #{request.financialManagerMobile}, business_license = #{request.businessLicense}, + unified_social_credit_code = #{request.unifiedSocialCreditCode}, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/QualificationsInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/QualificationsInfoDO.java index a774fd8ac..a53c498ad 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/QualificationsInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/QualificationsInfoDO.java @@ -206,6 +206,7 @@ public class QualificationsInfoDO { @Column(name = "business_license") private String businessLicense; - + @Column(name = "unified_social_credit_code") + private String unifiedSocialCreditCode; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java index 41d9c8525..ebb1a461a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java @@ -86,6 +86,8 @@ public class JoinIntentionRequest { private String financialManagerMobile; @ApiModelProperty("营业执照") private String businessLicense; + @ApiModelProperty("统一社会信用代码") + private String unifiedSocialCreditCode; public LineInfoDO toLineInfoDO() { LineInfoDO lineInfoDO = new LineInfoDO(); @@ -116,6 +118,7 @@ public class JoinIntentionRequest { qualificationsInfoDO.setHouseholdRegistrationAddress(this.householdRegistrationAddress); qualificationsInfoDO.setSettlementCardNo(this.settlementCardNo); qualificationsInfoDO.setSettlementCardPic(this.settlementCardPic); + qualificationsInfoDO.setUnifiedSocialCreditCode(this.unifiedSocialCreditCode); qualificationsInfoDO.setSettlementOpeningBank(this.settlementOpeningBank); qualificationsInfoDO.setEntrepreneurialExperience(this.entrepreneurialExperience); qualificationsInfoDO.setPreviouslyEngagedIndustries(this.previouslyEngagedIndustries); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 17fd5e030..077dbc484 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -434,14 +434,11 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu if (Objects.nonNull(lineInfoDO)) { addSignFranchiseResponse.setPartnerName(lineInfoDO.getUsername()); } - 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(qualificationsInfoDO.getJoinType())) { - addSignFranchiseResponse.setIdCardNo(signingBaseInfoDO.getBusinessLicenseCode()); - } - addSignFranchiseResponse.setIdCardAddress(signingBaseInfoDO.getIdCardAddress()); + if (Objects.nonNull(qualificationsInfoDO)) { + addSignFranchiseResponse.setIdCardNo(qualificationsInfoDO.getIdCardNo()); + addSignFranchiseResponse.setIdCardAddress(qualificationsInfoDO.getHouseholdRegistrationAddress()); } + if (Objects.nonNull(franchiseFeeDO)) { addSignFranchiseResponse.setYearFranchiseFee(franchiseFeeDO.getYearFranchiseFee()); addSignFranchiseResponse.setBigYearFranchiseFee(Convert.digitToChinese(Integer.valueOf(franchiseFeeDO.getYearFranchiseFee())));