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

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
bianyadong
2024-05-14 18:11:31 +08:00
parent 02c49ecd5e b541c4fc92
commit 46f0c8a74b
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-model/src/main/java/com/cool/store/entity/SystemBuildingShopDO.java
View File

@@ -175,6 +175,11 @@ public class SystemBuildingShopDO {
// regioGeneralId // regioGeneralId
systemBuildingShopDO.setRegioGeneralId(sysStoreAppRequest.getSupervisorDetail().getRegioGeneralId()); systemBuildingShopDO.setRegioGeneralId(sysStoreAppRequest.getSupervisorDetail().getRegioGeneralId());
systemBuildingShopDO.setStoreName(sysStoreAppRequest.getStoreDetail().getStoreName()); systemBuildingShopDO.setStoreName(sysStoreAppRequest.getStoreDetail().getStoreName());
systemBuildingShopDO.setBigName(sysStoreAppRequest.getStoreDetail().getBigName());
systemBuildingShopDO.setBigCode(sysStoreAppRequest.getStoreDetail().getBigCode());
systemBuildingShopDO.setFightName(sysStoreAppRequest.getStoreDetail().getFightName());
systemBuildingShopDO.setFightCode(sysStoreAppRequest.getStoreDetail().getFightCode());
systemBuildingShopDO.setSmallName(sysStoreAppRequest.getStoreDetail().getSmallName());
return systemBuildingShopDO; return systemBuildingShopDO;
} }
} }

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
View File

@@ -148,7 +148,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
} }
//2.未查到证照信息，所以查询鲜丰的默认值(只要鲜丰接口内有值，总是优先使用鲜丰数据) //2.未查到证照信息，所以查询鲜丰的默认值(只要鲜丰接口内有值，总是优先使用鲜丰数据)
ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId);
if (Objects.nonNull(shopInfoDO.getStoreNum())) { if (Objects.nonNull(shopInfoDO.getStoreNum()) && StringUtil.isNotBlank(shopInfoDO.getStoreNum())) {
GetStoreInfoByCodeResponse storeInfoCode = coolStoreStartFlowService.getStoreInfoCode(shopInfoDO.getStoreNum()); GetStoreInfoByCodeResponse storeInfoCode = coolStoreStartFlowService.getStoreInfoCode(shopInfoDO.getStoreNum());
if (Objects.nonNull(storeInfoCode.getData().getStoreDocument()) && storeInfoCode.getCode() == 0) { if (Objects.nonNull(storeInfoCode.getData().getStoreDocument()) && storeInfoCode.getCode() == 0) {
//替换落库的值 //替换落库的值

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -372,6 +372,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
addSignFranchiseResponse.setLicenseName(licenseTransactDO.getBusinessLicense()); addSignFranchiseResponse.setLicenseName(licenseTransactDO.getBusinessLicense());
addSignFranchiseResponse.setOpeAddress(licenseTransactDO.getLicenseAddress()); addSignFranchiseResponse.setOpeAddress(licenseTransactDO.getLicenseAddress());
addSignFranchiseResponse.setOperator(licenseTransactDO.getOperator()); addSignFranchiseResponse.setOperator(licenseTransactDO.getOperator());
addSignFranchiseResponse.setLicenseCode(licenseTransactDO.getCreditCode());
addSignFranchiseResponse.setType(LicenseTypeEnum.match(licenseTransactDO.getLicenseType()).getMessage());
} }
if (Objects.nonNull(lineInfoDO)) { if (Objects.nonNull(lineInfoDO)) {
addSignFranchiseResponse.setPartnerName(lineInfoDO.getUsername()); addSignFranchiseResponse.setPartnerName(lineInfoDO.getUsername());