老店
This commit is contained in:
@@ -198,9 +198,6 @@ public class ShopInfoDAO {
|
||||
|
||||
|
||||
public List<PlatformBuildListResponse> platformBuildList(List<Long> regionIds, platformBuildListRequest request){
|
||||
if(CollectionUtils.isEmpty(regionIds)){
|
||||
return new ArrayList<>();
|
||||
}
|
||||
return shopInfoMapper.platformBuildList(regionIds, request);
|
||||
}
|
||||
|
||||
|
||||
@@ -280,7 +280,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
|
||||
public PageInfo<PlatformBuildListResponse> platformBuildList(platformBuildListRequest request) {
|
||||
String userId = request.getOperateUserId();
|
||||
List<Long> regionIdList = new ArrayList<>();
|
||||
if (!sysRoleService.checkIsAdmin(userId)){
|
||||
if (!sysRoleService.checkIsAdmin(userId)) {
|
||||
List<String> regionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId);
|
||||
if (CollectionUtils.isEmpty(regionIds)) {
|
||||
return new PageInfo<>();
|
||||
@@ -289,9 +289,11 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
|
||||
regionIdList.add(Long.parseLong(regionId));
|
||||
}
|
||||
}
|
||||
List<Long> subRegionIdsByRegionIdList = regionMapper.getSubRegionIdsByRegionIdList(request.getRegionIds());
|
||||
if (CollectionUtils.isNotEmpty(subRegionIdsByRegionIdList)) {
|
||||
request.setRegionIds(subRegionIdsByRegionIdList);
|
||||
if (CollectionUtils.isNotEmpty(request.getRegionIds())) {
|
||||
List<Long> subRegionIdsByRegionIdList = regionMapper.getSubRegionIdsByRegionIdList(request.getRegionIds());
|
||||
if (CollectionUtils.isNotEmpty(subRegionIdsByRegionIdList)) {
|
||||
request.setRegionIds(subRegionIdsByRegionIdList);
|
||||
}
|
||||
}
|
||||
PageHelper.startPage(request.getPageNum(), request.getPageSize());
|
||||
List<PlatformBuildListResponse> responses = shopInfoDAO.platformBuildList(regionIdList, request);
|
||||
@@ -339,20 +341,20 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
|
||||
platformBuildResponse.setLegalIdCardFront(qualificationsInfoDO.getLegalIdCardFront());
|
||||
platformBuildResponse.setLegalIdCardBack(qualificationsInfoDO.getLegalIdCardBack());
|
||||
}
|
||||
if (Objects.nonNull(pointInfo)){
|
||||
platformBuildResponse.setShopProvinceCityDistrict(pointInfo.getProvince()+pointInfo.getCity()+pointInfo.getDistrict());
|
||||
if (Objects.nonNull(pointInfo)) {
|
||||
platformBuildResponse.setShopProvinceCityDistrict(pointInfo.getProvince() + pointInfo.getCity() + pointInfo.getDistrict());
|
||||
platformBuildResponse.setShopAddress(pointInfo.getAddress());
|
||||
}
|
||||
platformBuildResponse.setShopCode(shopInfo.getShopCode());
|
||||
platformBuildResponse.setFranchiseBrand(FranchiseBrandEnum.getDescByCode(shopInfo.getFranchiseBrand()));
|
||||
platformBuildResponse.setShopName(shopInfo.getShopName());
|
||||
platformBuildResponse.setBusinessMobile(informationDO.getBusinessMobile());
|
||||
if (Objects.nonNull(licenseTransactDO)){
|
||||
if (Objects.nonNull(licenseTransactDO)) {
|
||||
platformBuildResponse.setCreditUrl(licenseTransactDO.getCreditUrl());
|
||||
//("二证合一标识;0否 1 是")
|
||||
if (licenseTransactDO.getTwoCertificatesOne().equals(1)){
|
||||
if (licenseTransactDO.getTwoCertificatesOne().equals(1)) {
|
||||
platformBuildResponse.setFoodBusinessLicenseUrl(licenseTransactDO.getCreditUrl());
|
||||
}else if (licenseTransactDO.getTwoCertificatesOne().equals(0)){
|
||||
} else if (licenseTransactDO.getTwoCertificatesOne().equals(0)) {
|
||||
platformBuildResponse.setFoodBusinessLicenseUrl(licenseTransactDO.getFoodBusinessLicenseUrl());
|
||||
}
|
||||
}
|
||||
@@ -525,7 +527,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
|
||||
List<OperationLogDO> operationLogs = operationLogDAO.getBySubStageStatusEnumAndsStatus(shopId, nowStatus, OperationTypeEnum.OPERATION_TYPE_1.getCode());
|
||||
operationLogService.batchUpdateProcessed(operationLogs, auditId, request.getOperateUserId(), request.getReason());
|
||||
//平台账号维护
|
||||
accountDAO.changeStatus(shopId,platformBuildDO.getType(),request.getAccount(),request.getPassword(),request.getResultType());
|
||||
accountDAO.changeStatus(shopId, platformBuildDO.getType(), request.getAccount(), request.getPassword(), request.getResultType());
|
||||
platformBuildDO.setAuditId(auditId);
|
||||
platformBuildDO.setAccount(request.getAccount());
|
||||
platformBuildDO.setPassword(request.getPassword());
|
||||
|
||||
Reference in New Issue
Block a user