This commit is contained in:
shuo.wang
2025-04-16 14:56:10 +08:00
parent 02382591d7
commit 86669d454a
4 changed files with 10 additions and 2 deletions

View File

@@ -18,6 +18,8 @@ import java.util.Date;
@Data @Data
public class BuildInformationResponse { public class BuildInformationResponse {
private String username;
private Long shopId; private Long shopId;
@ApiModelProperty("门店名称") @ApiModelProperty("门店名称")

View File

@@ -17,6 +17,8 @@ import java.util.Objects;
@Data @Data
public class SubmitLicenseResponse { public class SubmitLicenseResponse {
@ApiModelProperty("加盟商name")
private String username;
@ApiModelProperty("法人身份证信息是否和加盟商一致false否true是") @ApiModelProperty("法人身份证信息是否和加盟商一致false否true是")
private Boolean legalIsSamePartner; private Boolean legalIsSamePartner;
@@ -222,7 +224,7 @@ public class SubmitLicenseResponse {
public static SubmitLicenseResponse from(LicenseTransactDO licenseTransactDO) { public static SubmitLicenseResponse from(LicenseTransactDO licenseTransactDO) {
if (Objects.isNull(licenseTransactDO)) { if (Objects.isNull(licenseTransactDO)) {
return null; return new SubmitLicenseResponse();
} }
SubmitLicenseResponse submitLicenseResponse = new SubmitLicenseResponse(); SubmitLicenseResponse submitLicenseResponse = new SubmitLicenseResponse();
submitLicenseResponse.setLegalIsSamePartner(licenseTransactDO.getLegalIsSamePartner()); submitLicenseResponse.setLegalIsSamePartner(licenseTransactDO.getLegalIsSamePartner());

View File

@@ -261,7 +261,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
EnterpriseUserDO user = enterpriseUserMapper.getUserInfoById(shopInfoDO.getSupervisorUserId()); EnterpriseUserDO user = enterpriseUserMapper.getUserInfoById(shopInfoDO.getSupervisorUserId());
submitLicenseResponse.setApprover(user.getName()); submitLicenseResponse.setApprover(user.getName());
} }
//3.既没有提交数据,也没有在鲜丰端查到证照信息,则返回空自由填写 //3.既没有提交数据,也没有在鲜丰端查到证照信息,则返回空自由填写\
LineInfoDO line = lineInfoMapper.getByLineId(shopInfoDO.getLineId());
submitLicenseResponse.setUsername(line.getUsername());
return submitLicenseResponse; return submitLicenseResponse;
} }

View File

@@ -64,6 +64,8 @@ public class BuildInformationServiceImpl implements BuildInformationService {
if (Objects.isNull(shopInfo)) { if (Objects.isNull(shopInfo)) {
throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);
} }
LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId());
response.setUsername(lineInfoDO.getUsername());
response.setShopId(shopId); response.setShopId(shopId);
response.setShopName(shopInfo.getShopName()); response.setShopName(shopInfo.getShopName());
response.setShopCode(shopInfo.getShopCode()); response.setShopCode(shopInfo.getShopCode());