From 0e1080b0e319eac3bb5c902234749c0d2a1850a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 9 Oct 2024 18:01:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=9C=81=E5=B8=82=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/entity/ShopInfoDO.java | 3 +++ .../request/AddSignFranchiseRequest.java | 4 ++++ .../response/AddSignFranchiseResponse.java | 10 ++++++++ .../impl/SignFranchiseServiceImpl.java | 24 +++++++++++++++++-- 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java index 389ed8714..640123325 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java @@ -91,6 +91,9 @@ public class ShopInfoDO { @Column(name = "shop_stage") private Integer shopStage; + @Column(name = "铺位详细地址") + private String detailAddress; + /** * 删除标识 */ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java index a0367325e..66f3e897b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java @@ -18,6 +18,10 @@ public class AddSignFranchiseRequest { private Long shopId; private Long regionId; + + private String shopName; + + private String detailAddress; /** * SignTypeEnum */ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java index 233c353f5..19c7d203d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java @@ -13,6 +13,13 @@ public class AddSignFranchiseResponse { private Long id; private Long shopId; + + private Long regionId; + + private String regionName; + + private String detailAddress; + /** * SignTypeEnum */ @@ -61,6 +68,9 @@ public class AddSignFranchiseResponse { @ApiModelProperty("门店地址") private String storeAddress; + @ApiModelProperty("门店省市区") + private String storeProvinceCity; + @ApiModelProperty("所属大区") private String bigRegion; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index e26e92a5a..8d62101fc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -20,8 +20,10 @@ import com.cool.store.response.ResponseResult; import com.cool.store.service.CoolStoreStartFlowService; import com.cool.store.service.PreparationService; import com.cool.store.service.SignFranchiseService; +import com.cool.store.utils.GeoMapUtil; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.poi.DateUtils; +import com.cool.store.utils.poi.StringUtils; import com.cool.store.utils.poi.constant.Constants; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -87,6 +89,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu @Resource QualificationsInfoDAO qualificationsInfoDAO; + @Resource + RegionMapper regionMapper; + @Override public Boolean auditResult(AuditResultRequest request) { @@ -163,6 +168,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu } //店铺信息 ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(request.getShopId()); + shopInfoDO.setRegionId(request.getRegionId()); + shopInfoDO.setShopName(request.getShopName()); + shopInfoDO.setDetailAddress(request.getDetailAddress()); shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO); //更新状态为加盟商 LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); @@ -226,14 +234,17 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectOne(FranchiseFeeDO.builder().shopId(shopId).build()); //线索id Long lineId = shopInfoDO.getLineId(); - //签约信息 - SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(null, lineId); //缴款信息 LinePayDO linePayDO = linePayMapper.getByLineIdAndPayTypeAndShopId(lineId, 1, shopId); //铺位信息 PointInfoDO pointInfoDO = pointInfoMapper.getDataByShopIdAndLineId(lineId, shopId); //证照办理 LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId); + + RegionDO regionInfo = regionMapper.getByRegionId(lineInfoDO.getRegionId()); + + + addSignFranchiseResponse.setDetailAddress(shopInfoDO.getDetailAddress()); if (Objects.nonNull(signFranchiseDO)) { addSignFranchiseResponse.setId(signFranchiseDO.getId()); addSignFranchiseResponse.setShopId(signFranchiseDO.getShopId()); @@ -255,8 +266,17 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu } addSignFranchiseResponse.setStoreName(shopInfoDO.getShopName()); + if (Objects.nonNull(regionInfo)){ + addSignFranchiseResponse.setRegionId(lineInfoDO.getRegionId()); + addSignFranchiseResponse.setRegionName(regionInfo.getName()); + } + if (Objects.nonNull(pointInfoDO)) { addSignFranchiseResponse.setStoreAddress(pointInfoDO.getAddress()); + if (StringUtils.isNoneBlank(pointInfoDO.getLatitude(), pointInfoDO.getLongitude())){ + GeoMapUtil.AddressInfo addressInfo = GeoMapUtil.reverseGeoCoding(pointInfoDO.getLatitude(), pointInfoDO.getLongitude()); + addSignFranchiseResponse.setStoreProvinceCity(String.format("%s%s%s", addressInfo.getProvince(), addressInfo.getCity(), addressInfo.getDistrict())); + } } if (Objects.nonNull(linePayDO)) { addSignFranchiseResponse.setPayName(linePayDO.getPayUserName());