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

coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java

@@ -57,11 +57,11 @@ public class LicenseTransactDO {
     private Date foodBusinessEndTime;
     @Column(name = "food_business_license_url")
     private String foodBusinessLicenseUrl;
-    @Column(name = "foodLicenseRemark")
+    @Column(name = "food_license_remark")
     private String foodLicenseRemark;
     @Column(name = "remark_url")
     private String remarkUrl;
-    @Column(name = "businessLicenseRemark")
+    @Column(name = "business_license_remark")
     private String businessLicenseRemark;
     @Column(name = "submit_status")
     private Integer submitStatus;

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 = "detail_address")
+    private String detailAddress;
+
     /**
      * 删除标识
      */

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
      */

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;
 

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());