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 9adc77cf7..25a79cd23 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 @@ -18,6 +18,8 @@ import java.util.Date; @Data public class BuildInformationResponse { + private String username; + private Long shopId; @ApiModelProperty("门店名称") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java index f30c46fa9..ccd4957a5 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java @@ -17,6 +17,8 @@ import java.util.Objects; @Data public class SubmitLicenseResponse { + @ApiModelProperty("加盟商name") + private String username; @ApiModelProperty("法人身份证信息是否和加盟商一致,false否,true是") private Boolean legalIsSamePartner; @@ -222,7 +224,7 @@ public class SubmitLicenseResponse { public static SubmitLicenseResponse from(LicenseTransactDO licenseTransactDO) { if (Objects.isNull(licenseTransactDO)) { - return null; + return new SubmitLicenseResponse(); } SubmitLicenseResponse submitLicenseResponse = new SubmitLicenseResponse(); submitLicenseResponse.setLegalIsSamePartner(licenseTransactDO.getLegalIsSamePartner()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index 46620424f..8f107f5c5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -261,7 +261,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { EnterpriseUserDO user = enterpriseUserMapper.getUserInfoById(shopInfoDO.getSupervisorUserId()); submitLicenseResponse.setApprover(user.getName()); } - //3.既没有提交数据,也没有在鲜丰端查到证照信息,则返回空自由填写 + //3.既没有提交数据,也没有在鲜丰端查到证照信息,则返回空自由填写\ + LineInfoDO line = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); + submitLicenseResponse.setUsername(line.getUsername()); return submitLicenseResponse; } 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 060c08316..3dc6eb4fd 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 @@ -64,6 +64,8 @@ public class BuildInformationServiceImpl implements BuildInformationService { if (Objects.isNull(shopInfo)) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId()); + response.setUsername(lineInfoDO.getUsername()); response.setShopId(shopId); response.setShopName(shopInfo.getShopName()); response.setShopCode(shopInfo.getShopCode());