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

fix

Browse Source
This commit is contained in:
shuo.wang
2025-04-16 13:51:50 +08:00
parent 727d4add0e
commit 02382591d7
5 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/resources/mapper/BuildInformationMapper.xml
View File

@@ -38,6 +38,8 @@
<result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
<result property="cShopName" column="c_shop_name" jdbcType="VARCHAR"/>
<result property="settlerBankBackPhotoUrl" column="settler_bank_back_photo_url" jdbcType="VARCHAR"/>
<result property="settlerIsSamePartner" column="settler_is_same_partner" jdbcType="TINYINT"/>
<result property="juridicalIsSamePartner" column="juridical_is_same_partner" jdbcType="TINYINT"/>
</resultMap>
<sql id="Base_Column_List">
@@ -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
</sql>
</mapper>

6
coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java
View File

@@ -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;
}

8
coolstore-partner-model/src/main/java/com/cool/store/request/BuildInformationRequest.java
View File

@@ -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;
}

6
coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java
View File

@@ -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;

18
coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
View File

@@ -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<String, String> map = new HashMap<>();
map.put("partnerUsername", lineInfoDO.getUsername());
map.put("partnerMobile", lineInfoDO.getMobile());