From 02382591d74cd0b0c31ae4a0663842419480f21c Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 16 Apr 2025 13:51:50 +0800 Subject: [PATCH] fix --- .../mapper/BuildInformationMapper.xml | 4 +++- .../cool/store/entity/BuildInformationDO.java | 6 ++++++ .../store/request/BuildInformationRequest.java | 8 ++++++++ .../response/BuildInformationResponse.java | 6 +++++- .../impl/BuildInformationServiceImpl.java | 18 ++++++++++++++++-- 5 files changed, 38 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/BuildInformationMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/BuildInformationMapper.xml index c3b446171..08cdb1104 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/BuildInformationMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/BuildInformationMapper.xml @@ -38,6 +38,8 @@ + + @@ -49,6 +51,6 @@ 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 + update_user,c_shop_name,settler_bank_back_photo_url,settler_is_same_partner,juridical_is_same_partner diff --git 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 index 5ebc8d85e..a2ee92e0e 100644 --- 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 @@ -196,4 +196,10 @@ public class BuildInformationDO { //火码，点餐小程序店铺名称', @Column(name = "c_shop_name") private String cShopName; + + @Column(name = "settler_is_same_partner") + private Boolean settlerIsSamePartner; + + @Column(name = "juridical_is_same_partner") + private Boolean juridicalIsSamePartner; } \ No newline at end of file diff --git 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 index b6c7094e3..68e3f7a6b 100644 --- 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 @@ -58,6 +58,9 @@ public class BuildInformationRequest { @ApiModelProperty("店内照（图片）") private String inStorePhoto; + @ApiModelProperty("法人身份证信息是否和加盟商一致，false否，true是") + private Boolean juridicalIsSamePartner; + @NotBlank(message = "法人身份证正面 不能为空") @Length(max = 250 , message = "法人身份证正面长度不能超过250") @ApiModelProperty("法人身份证正面（图片）") @@ -83,6 +86,9 @@ public class BuildInformationRequest { @ApiModelProperty("法人手持身份证反面（图片）") private String juridicalHandheldIdCardReverse; + @ApiModelProperty("结算人身份证信息是否和加盟商一致，false否，true是") + private Boolean settlerIsSamePartner; + @ApiModelProperty("结算人姓名") @NotBlank(message = "结算人姓名 不能为空") @JsonProperty("settlerName") @@ -204,6 +210,8 @@ public class BuildInformationRequest { buildInformationDO.setRelationshipProve(this.relationshipProve); buildInformationDO.setAccountOpeningPermit(this.accountOpeningPermit); buildInformationDO.setCShopName(this.miniProgramsShopName); + buildInformationDO.setSetterIsSamePartner(this.settlerIsSamePartner); + buildInformationDO.setJuridicalIsSamePartner(this.juridicalIsSamePartner); return buildInformationDO; } diff --git 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 index efc67da1c..9adc77cf7 100644 --- 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 @@ -55,7 +55,8 @@ public class BuildInformationResponse { @ApiModelProperty("店内照（图片）") private String inStorePhoto; - + @ApiModelProperty("法人身份证信息是否和加盟商一致，false否，true是") + private Boolean juridicalIsSamePartner; @ApiModelProperty("法人身份证正面（图片）") private String juridicalIdCardFront; @@ -74,6 +75,9 @@ public class BuildInformationResponse { @ApiModelProperty("结算人姓名") private String settlerName; + @ApiModelProperty("结算人身份证信息是否和加盟商一致，false否，true是") + private Boolean settlerIsSamePartner; + @ApiModelProperty("结算人身份证正面（图片）") private String settlerIdCardFront; diff --git 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 index dd28aae6d..060c08316 100644 --- 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 @@ -139,6 +139,8 @@ public class BuildInformationServiceImpl implements BuildInformationService { response.setSettlerInHandBackPicture(informationDO.getSettlerInHandBackPicture()); response.setMiniProgramsShopName(informationDO.getCShopName()); response.setSettlerBankBackPhotoUrl(informationDO.getSettlerBankBackPhotoUrl()); + response.setSettlerIsSamePartner(informationDO.getSettlerIsSamePartner()); + response.setJuridicalIsSamePartner(informationDO.getJuridicalIsSamePartner()); } @Override @@ -153,12 +155,24 @@ public class BuildInformationServiceImpl implements BuildInformationService { }else{ orderSysInfoDAO.insertSelective(orderSysInfoDO); } + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); + QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfoDO.getId()); + if (request.getJuridicalIsSamePartner()){ + request.setJuridicalIdCardNo(qualificationsInfoDO.getIdCardNo()); + request.setJuridicalIdCardFront(qualificationsInfoDO.getFrontOfIdCard()); + request.setJuridicalIdCardReverse(qualificationsInfoDO.getBackOfIdCard()); + } + if (request.getSettlerIsSamePartner()){ + request.setSettlerIdCardNo(qualificationsInfoDO.getIdCardNo()); + request.setSettlerName(lineInfoDO.getUsername()); + request.setSettlerIdCardFront(qualificationsInfoDO.getFrontOfIdCard()); + request.setSettlerIdCardReverse(qualificationsInfoDO.getBackOfIdCard()); + } if (Objects.isNull(informationDO)) { buildInformationDO.setCreateTime(new Date()); buildInformationDO.setUpdateTime(new Date()); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151); - ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); - LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); HashMap map = new HashMap<>(); map.put("partnerUsername", lineInfoDO.getUsername()); map.put("partnerMobile", lineInfoDO.getMobile());