fix

2025-06-11 11:01:23 +08:00
parent a40bcbc5e5
commit 541eac1799
6 changed files with 24 additions and 10 deletions
--- a/coolstore-partner-dao/src/main/resources/mapper/BuildInformationMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/BuildInformationMapper.xml
@@ -19,6 +19,7 @@
        <result property="juridicalHandheldIdCardReverse" column="juridical_handheld_id_card_reverse"
                jdbcType="VARCHAR"/>
        <result property="juridicalIdCardNo" column="juridical_id_card_no" jdbcType="VARCHAR"/>
+        <result property="juridicalName" column="juridical_name" jdbcType="VARCHAR"/>
        <result property="settlerName" column="settler_name" jdbcType="VARCHAR"/>
        <result property="settlerIdCardFront" column="settler_id_card_front" jdbcType="VARCHAR"/>
        <result property="settlerIdCardReverse" column="settler_id_card_reverse" jdbcType="VARCHAR"/>
@@ -51,7 +52,7 @@
        settler_id_card_front,settler_id_card_reverse,settler_in_hand_front_picture,settler_in_hand_back_picture,settler_id_card_no,
        settler_bank_number,settler_bank_mobile,settler_bank_name,
        create_time,update_time,create_user,
-        update_user,c_shop_name,settler_bank_back_photo_url,settler_is_same_partner,juridical_is_same_partner
+        update_user,c_shop_name,settler_bank_back_photo_url,settler_is_same_partner,juridical_is_same_partner,juridical_name
    </sql>
    <insert id="batchInsertSpecific">
        <foreach collection="list" item="item" index="index" separator=";">
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java
@@ -82,6 +82,12 @@ public class BuildInformationDO {
    @Column(name = "juridical_id_card_no")
    private String juridicalIdCardNo;

+    /**
+     * 法人姓名
+     */
+    @Column(name = "juridical_name")
+    private String juridicalName;
+
    /**
     * 法人手持身份证正面（图片）
     */
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/BuildInformationRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BuildInformationRequest.java
@@ -76,6 +76,9 @@ public class BuildInformationRequest {
    @Length(max = 18, message = "法人身份证号长度必须为18位")
    @ApiModelProperty("法人身份证号")
    private String juridicalIdCardNo;
+    @ApiModelProperty("法人姓名")
+    @JsonProperty("juridicalName")
+    private String juridicalName;

    @NotBlank(message = "法人手持身份证正面  不能为空")
    @Length(max = 250 , message = "法人手持身份证正面 长度不能超过250")
@@ -193,6 +196,7 @@ public class BuildInformationRequest {
        buildInformationDO.setDoorPhoto(this.doorPhoto);
        buildInformationDO.setInStorePhoto(this.inStorePhoto);
        buildInformationDO.setJuridicalIdCardNo(this.juridicalIdCardNo);
+        buildInformationDO.setJuridicalName(this.juridicalName);
        buildInformationDO.setJuridicalIdCardFront(this.juridicalIdCardFront);
        buildInformationDO.setJuridicalIdCardReverse(this.juridicalIdCardReverse);
        buildInformationDO.setJuridicalHandheldIdCardFront(this.juridicalHandheldIdCardFront);
--- a/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java
@@ -68,6 +68,9 @@ public class BuildInformationResponse {
    @ApiModelProperty("法人身份证号")
    private String juridicalIdCardNo;

+    @ApiModelProperty("法人姓名")
+    private String juridicalName;
+
    @ApiModelProperty("法人手持身份证正面（图片）")
    private String juridicalHandheldIdCardFront;

--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
@@ -213,6 +213,7 @@ public class BuildInformationServiceImpl implements BuildInformationService {
                LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
                QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfoDO.getId());
                if (request.getJuridicalIsSamePartner()) {
+                    buildInformationDO.setJuridicalName(lineInfoDO.getUsername());
                    buildInformationDO.setJuridicalIdCardNo(qualificationsInfoDO.getIdCardNo());
                    buildInformationDO.setJuridicalIdCardFront(qualificationsInfoDO.getFrontOfIdCard());
                    buildInformationDO.setJuridicalIdCardReverse(qualificationsInfoDO.getBackOfIdCard());
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
@@ -345,7 +345,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
                        dto.setElMeStageStatus(stageDTO.getShopSubStageStatus());
                    } else if (stageDTO.getShopSubStage().equals(ShopSubStageEnum.SHOP_STAGE_22.getShopSubStage())) {
                        dto.setKsStageStatus(stageDTO.getShopSubStageStatus());
-                    }else if (stageDTO.getShopSubStage().equals(ShopSubStageEnum.SHOP_STAGE_25.getShopSubStage())) {
+                    } else if (stageDTO.getShopSubStage().equals(ShopSubStageEnum.SHOP_STAGE_25.getShopSubStage())) {
                        dto.setJDStageStatus(stageDTO.getShopSubStageStatus());
                    }
                }
@@ -364,11 +364,9 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
        QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(shopInfo.getLineId());
        BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(shopId);
        LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId);
-        if (Objects.nonNull(qualificationsInfoDO)) {
-            platformBuildResponse.setLegalName(qualificationsInfoDO.getLegalName());
-            platformBuildResponse.setLegalIdCardFront(qualificationsInfoDO.getLegalIdCardFront());
-            platformBuildResponse.setLegalIdCardBack(qualificationsInfoDO.getLegalIdCardBack());
-        }
+        platformBuildResponse.setLegalName(informationDO.getJuridicalName());
+        platformBuildResponse.setLegalIdCardFront(informationDO.getJuridicalIdCardFront());
+        platformBuildResponse.setLegalIdCardBack(informationDO.getSettlerIdCardReverse());
        if (Objects.nonNull(pointInfo)) {
            platformBuildResponse.setShopProvinceCityDistrict(pointInfo.getProvince() + pointInfo.getCity() + pointInfo.getDistrict());
            platformBuildResponse.setShopAddress(pointInfo.getAddress());
@@ -389,8 +387,9 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
        if (Objects.isNull(platformBuildDO)) {
            BeanUtils.copyProperties(informationDO, platformBuildResponse);
            AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId);
-            if(Objects.nonNull(acceptanceInfoDO)){
-            platformBuildResponse.setStorePositioningUrl(acceptanceInfoDO.getShopLocationScreenshots());}
+            if (Objects.nonNull(acceptanceInfoDO)) {
+                platformBuildResponse.setStorePositioningUrl(acceptanceInfoDO.getShopLocationScreenshots());
+            }
            return platformBuildResponse;
        }
        BeanUtils.copyProperties(platformBuildDO, platformBuildResponse);
@@ -407,7 +406,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
            OperationLogDO trial = operationLogDAO.getByCondition(shopId, SHOP_SUB_STAGE_STATUS_251.getShopSubStageStatus());
            ShopAuditInfoDO auditInfo = shopAuditInfoDAO.getAuditInfo(platformBuildDO.getAuditId());
            doSomething(platformBuildResponse, trial, auditInfo);
-        }else {
+        } else {
            ShopAuditInfoDO auditInfo = shopAuditInfoDAO.getAuditInfo(platformBuildDO.getAuditId());
            if (Objects.nonNull(auditInfo)) {
                if (auditInfo.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) {