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

Merge branch 'cc_20250609_takeoutBuild' into 'master'

Browse Source 
Cc 20250609 takeout build

See merge request hangzhou/java/custom_zxjp!113
This commit is contained in:
苏竹红
2025-06-11 10:29:48 +00:00
parent cb3a23aaf9 c8337c4f2c
commit 31e09c0e3f
10 changed files with 210 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-service/src/main/java/com/cool/store/service/BuildInformationService.java
View File

@@ -2,6 +2,7 @@ package com.cool.store.service;
import com.cool.store.request.BuildInformationRequest;
import com.cool.store.request.BuildSettlerRequest;
import com.cool.store.response.BuildInformationResponse;
/**
@@ -17,4 +18,6 @@ public interface BuildInformationService {
Integer getJoinType(Long lineId);
Boolean updateBuildSettler(BuildSettlerRequest request,String userId);
}

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

@@ -10,6 +10,7 @@ import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.WarehouseInfoMapper;
import com.cool.store.request.BuildInformationRequest;
import com.cool.store.request.BuildSettlerRequest;
import com.cool.store.response.BuildInformationResponse;
import com.cool.store.service.BuildInformationService;
import com.cool.store.mapper.BuildInformationMapper;
@@ -38,6 +39,8 @@ import java.util.stream.Stream;
*/
@Service
public class BuildInformationServiceImpl implements BuildInformationService {
@Resource
private PlatformBuildDAO platformBuildDAO;
@Resource
private EnumInfoService enumInfoService;
@Resource
@@ -164,6 +167,7 @@ public class BuildInformationServiceImpl implements BuildInformationService {
response.setDoorPhoto(informationDO.getDoorPhoto());
response.setInStorePhoto(informationDO.getInStorePhoto());
response.setJuridicalIdCardFront(informationDO.getJuridicalIdCardFront());
response.setJuridicalName(informationDO.getJuridicalName());
response.setJuridicalIdCardNo(informationDO.getJuridicalIdCardNo());
response.setJuridicalIdCardReverse(informationDO.getJuridicalIdCardReverse());
response.setJuridicalHandheldIdCardReverse(informationDO.getJuridicalHandheldIdCardReverse());
@@ -210,6 +214,7 @@ public class BuildInformationServiceImpl implements BuildInformationService {
LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfoDO.getId());
if (request.getJuridicalIsSamePartner()) {
buildInformationDO.setJuridicalName(lineInfoDO.getUsername());
buildInformationDO.setJuridicalIdCardNo(qualificationsInfoDO.getIdCardNo());
buildInformationDO.setJuridicalIdCardFront(qualificationsInfoDO.getFrontOfIdCard());
buildInformationDO.setJuridicalIdCardReverse(qualificationsInfoDO.getBackOfIdCard());
@@ -239,6 +244,22 @@ public class BuildInformationServiceImpl implements BuildInformationService {
return buildInformationDAO.insertSelective(buildInformationDO);
} else {
buildInformationDO.setUpdateTime(new Date());
List<PlatformBuildDO> platformBuildDOS = platformBuildDAO.selectByShopId(request.getShopId());
if (CollectionUtils.isNotEmpty(platformBuildDOS)){
for (PlatformBuildDO platformBuildDO : platformBuildDOS){
platformBuildDO.setSettlerName(buildInformationDO.getSettlerName());
platformBuildDO.setSettlerIdCardFront(buildInformationDO.getSettlerIdCardFront());
platformBuildDO.setSettlerIdCardReverse(buildInformationDO.getSettlerIdCardReverse());
platformBuildDO.setSettlerInHandBackPicture(buildInformationDO.getSettlerInHandBackPicture());
platformBuildDO.setSettlerInHandFrontPicture(buildInformationDO.getSettlerInHandFrontPicture());
platformBuildDO.setSettlerIdCardNo(buildInformationDO.getSettlerIdCardNo());
platformBuildDO.setSettlerBankPhotoUrl(buildInformationDO.getSettlerBankPhotoUrl());
platformBuildDO.setSettlerBankNumber(buildInformationDO.getSettlerBankNumber());
platformBuildDO.setSettlerBankMobile(buildInformationDO.getSettlerBankMobile());
platformBuildDO.setSettlerBankName(buildInformationDO.getSettlerBankName());
}
}
platformBuildDAO.batchUpdate(platformBuildDOS);
return buildInformationDAO.updateByShopIdSelective(buildInformationDO);
}
}else{
@@ -275,6 +296,54 @@ public class BuildInformationServiceImpl implements BuildInformationService {
return qualificationsInfoDO.getJoinType();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateBuildSettler(BuildSettlerRequest request,String userId) {
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId());
QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(shopInfo.getLineId());
BuildInformationDO buildInformationDO = buildInformationDAO.selectOneByShopId(request.getShopId());
if (request.getSettlerIsSamePartner()) {
buildInformationDO.setSettlerIdCardNo(qualificationsInfoDO.getIdCardNo());
buildInformationDO.setSettlerName(lineInfoDO.getUsername());
buildInformationDO.setSettlerIdCardFront(qualificationsInfoDO.getFrontOfIdCard());
buildInformationDO.setSettlerIdCardReverse(qualificationsInfoDO.getBackOfIdCard());
}else{
buildInformationDO.setSettlerName(request.getSettlerName());
buildInformationDO.setSettlerIdCardNo(request.getSettlerIdCardNo());
buildInformationDO.setSettlerIdCardFront(request.getSettlerIdCardFront());
buildInformationDO.setSettlerIdCardReverse(request.getSettlerIdCardReverse());
}
buildInformationDO.setSettlerIsSamePartner(request.getSettlerIsSamePartner());
buildInformationDO.setSettlerInHandBackPicture(request.getSettlerInHandBackPicture());
buildInformationDO.setSettlerInHandFrontPicture(request.getSettlerInHandFrontPicture());
buildInformationDO.setSettlerBankPhotoUrl(request.getSettlerBankPhotoUrl());
buildInformationDO.setSettlerBankNumber(request.getSettlerBankNumber());
buildInformationDO.setSettlerBankMobile(request.getSettlerBankMobile());
buildInformationDO.setSettlerBankName(request.getSettlerBankName());
buildInformationDO.setSettlerBankBackPhotoUrl(request.getSettlerBankBackPhotoUrl());
buildInformationDO.setUpdateTime(new Date());
buildInformationDO.setUpdateUser(userId);
buildInformationDAO.updateByShopIdSelective(buildInformationDO);
List<PlatformBuildDO> platformBuildDOS = platformBuildDAO.selectByShopId(request.getShopId());
if (CollectionUtils.isNotEmpty(platformBuildDOS)){
for (PlatformBuildDO platformBuildDO : platformBuildDOS){
platformBuildDO.setSettlerName(buildInformationDO.getSettlerName());
platformBuildDO.setSettlerIdCardFront(buildInformationDO.getSettlerIdCardFront());
platformBuildDO.setSettlerIdCardReverse(buildInformationDO.getSettlerIdCardReverse());
platformBuildDO.setSettlerInHandBackPicture(buildInformationDO.getSettlerInHandBackPicture());
platformBuildDO.setSettlerInHandFrontPicture(buildInformationDO.getSettlerInHandFrontPicture());
platformBuildDO.setSettlerIdCardNo(buildInformationDO.getSettlerIdCardNo());
platformBuildDO.setSettlerBankPhotoUrl(buildInformationDO.getSettlerBankPhotoUrl());
platformBuildDO.setSettlerBankNumber(buildInformationDO.getSettlerBankNumber());
platformBuildDO.setSettlerBankMobile(buildInformationDO.getSettlerBankMobile());
platformBuildDO.setSettlerBankName(buildInformationDO.getSettlerBankName());
}
}
platformBuildDAO.batchUpdate(platformBuildDOS);
return true;
}
}

29
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
View File

@@ -345,7 +345,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
dto.setElMeStageStatus(stageDTO.getShopSubStageStatus());
} else if (stageDTO.getShopSubStage().equals(ShopSubStageEnum.SHOP_STAGE_22.getShopSubStage())) {
dto.setKsStageStatus(stageDTO.getShopSubStageStatus());
}else if (stageDTO.getShopSubStage().equals(ShopSubStageEnum.SHOP_STAGE_25.getShopSubStage())) {
} else if (stageDTO.getShopSubStage().equals(ShopSubStageEnum.SHOP_STAGE_25.getShopSubStage())) {
dto.setJDStageStatus(stageDTO.getShopSubStageStatus());
}
}
@@ -364,15 +364,11 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(shopInfo.getLineId());
BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(shopId);
LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId);
if (Objects.nonNull(qualificationsInfoDO)) {
platformBuildResponse.setLegalName(qualificationsInfoDO.getLegalName());
platformBuildResponse.setLegalIdCardFront(qualificationsInfoDO.getLegalIdCardFront());
platformBuildResponse.setLegalIdCardBack(qualificationsInfoDO.getLegalIdCardBack());
}
if (Objects.nonNull(pointInfo)) {
platformBuildResponse.setShopProvinceCityDistrict(pointInfo.getProvince() + pointInfo.getCity() + pointInfo.getDistrict());
platformBuildResponse.setShopAddress(pointInfo.getAddress());
}
platformBuildResponse.setLegalName(informationDO.getJuridicalName());
platformBuildResponse.setLegalIdCardFront(informationDO.getJuridicalIdCardFront());
platformBuildResponse.setLegalIdCardBack(informationDO.getSettlerIdCardReverse());
platformBuildResponse.setShopProvinceCityDistrict(shopInfo.getProvince() + shopInfo.getCity() + shopInfo.getDistrict());
platformBuildResponse.setShopAddress(shopInfo.getDetailAddress());
platformBuildResponse.setShopCode(shopInfo.getShopCode());
platformBuildResponse.setFranchiseBrand(FranchiseBrandEnum.getDescByCode(shopInfo.getFranchiseBrand()));
platformBuildResponse.setShopName(shopInfo.getShopName());
@@ -386,11 +382,16 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
platformBuildResponse.setFoodBusinessLicenseUrl(licenseTransactDO.getFoodBusinessLicenseUrl());
}
}
AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId);
if (Objects.nonNull(acceptanceInfoDO)) {
platformBuildResponse.setShopDoorwayPhoto(acceptanceInfoDO.getShopDoorwayPhoto());
platformBuildResponse.setShopInteriorPhoto(acceptanceInfoDO.getShopInteriorPhoto());
}
if (Objects.isNull(platformBuildDO)) {
BeanUtils.copyProperties(informationDO, platformBuildResponse);
AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId);
if(Objects.nonNull(acceptanceInfoDO)){
platformBuildResponse.setStorePositioningUrl(acceptanceInfoDO.getShopLocationScreenshots());}
if (Objects.nonNull(acceptanceInfoDO)) {
platformBuildResponse.setStorePositioningUrl(acceptanceInfoDO.getShopLocationScreenshots());
}
return platformBuildResponse;
}
BeanUtils.copyProperties(platformBuildDO, platformBuildResponse);
@@ -407,7 +408,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
OperationLogDO trial = operationLogDAO.getByCondition(shopId, SHOP_SUB_STAGE_STATUS_251.getShopSubStageStatus());
ShopAuditInfoDO auditInfo = shopAuditInfoDAO.getAuditInfo(platformBuildDO.getAuditId());
doSomething(platformBuildResponse, trial, auditInfo);
}else {
} else {
ShopAuditInfoDO auditInfo = shopAuditInfoDAO.getAuditInfo(platformBuildDO.getAuditId());
if (Objects.nonNull(auditInfo)) {
if (auditInfo.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) {