Merge #33 into master from cc_20260106_point_update

铺位管理地图 * cc_20260106_point_update: (15 commits squashed) - feat:铺位改造 - Merge branch 'refs/heads/master' into cc_20260106_point_update - feat:铺位调整 - feat:新增字段 - feat:新增字段 - feat:新增字段 - feat:点位ID 处理校验规则 - feat:保存铺位返回点位ID - feat:根据主数据门店编码获取CRM点位数据 - feat:铺位 - feat:我的铺位根据管辖 - fix:bug 查询 - fix:PC端点位新增直接关联铺位 bug - feat:过滤已开店的铺位 - Merge branch 'master' into cc_20260106_point_update Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/33
2026-01-23 06:48:32 +00:00
parent 44ba00dc38
commit 1b1684f373
33 changed files with 2686 additions and 80 deletions
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointFinancialDataDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointFinancialDataDAO.java
@@ -0,0 +1,49 @@
+package com.cool.store.dao;
+
+import com.cool.store.entity.PointFinancialDataDO;
+import com.cool.store.mapper.PointFinancialDataMapper;
+import io.lettuce.core.dynamic.annotation.Param;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.Objects;
+
+/**
+ * @Auther zx_szh
+ * @Date 2026/1/8 11:31
+ * @Version 1.0
+ */
+@Repository
+public class PointFinancialDataDAO {
+
+    @Resource
+    private PointFinancialDataMapper pointFinancialDataDOMapper;
+
+    public int insertPointFinancialData(PointFinancialDataDO pointFinancialDataDO){
+        return pointFinancialDataDOMapper.insertPointFinancialData(pointFinancialDataDO);
+    }
+
+    /**
+     * 修改点位财务数据
+     * @param pointFinancialDataDO 点位财务数据对象
+     * @return 更新记录数
+     */
+    public int updatePointFinancialData(PointFinancialDataDO pointFinancialDataDO){
+        return pointFinancialDataDOMapper.updatePointFinancialData(pointFinancialDataDO);
+    }
+
+    /**
+     * 根据点位ID查询点位财务数据
+     * @param pointId 点位ID
+     * @return 点位财务数据对象
+     */
+    public PointFinancialDataDO selectByPointId(@Param("pointId") Long pointId){
+        if(Objects.isNull(pointId)) {
+            return null;
+        }
+        return pointFinancialDataDOMapper.selectByPointId(pointId);
+    }
+
+
+
+}
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointInfoDAO.java
@@ -6,12 +6,14 @@ import com.cool.store.dto.MiniShopDTO;
 import com.cool.store.dto.PCPointListDTO;
 import com.cool.store.dto.PointInfoDTO;
 import com.cool.store.dto.point.LineCountDTO;
+import com.cool.store.dto.point.PointStatisticsDTO;
 import com.cool.store.entity.PointInfoDO;
 import com.cool.store.mapper.PointInfoMapper;
 import com.cool.store.request.*;
 import com.cool.store.utils.StringUtil;
 import com.cool.store.vo.point.MiniPointPageVO;
 import com.cool.store.vo.point.PointHomePageDataVO;
+import com.cool.store.vo.point.PointMapVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Lists;
@@ -127,6 +129,14 @@ public class PointInfoDAO {
        return pointInfoMapper.getTeamPointPage(eid,request);
    }

+    public List<PointMapVO> getAllPointList(String eid, PointMapRequest request) {
+        return pointInfoMapper.getAllPointList(eid,request);
+    }
+
+    public PointStatisticsDTO getTeamCount(String eid, AllPointPageRequest request) {
+        return pointInfoMapper.getTeamCount(eid,request);
+    }
+
    public Integer recyclePoint(Long pointId) {
        if(Objects.isNull(pointId)){
            return CommonConstants.ZERO;
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDao.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDao.java
@@ -215,11 +215,19 @@ public class RegionDao {
        return regionMapper.getSubRegionByParentIdsAndRegionType(parentIdList, regionType);
    }

-    public List<String> getSubIdsByRegionIdsAndType(List<String> regionIds,String regionType){
+
+    /**
+     *
+     * @param regionIds
+     * @param regionType
+     * @param queryInvestBigRegion 只查询招商所属大区 进一步过滤无关区域 因为新增铺位或者新增线索只能选择招商大区
+     * @return
+     */
+    public List<String> getSubIdsByRegionIdsAndType(List<String> regionIds,String regionType,Boolean queryInvestBigRegion){
        if (CollectionUtils.isEmpty(regionIds)){
            return Lists.newArrayList();
        }
-        return regionMapper.getSubIdsByRegionIdsAndType(regionIds, regionType);
+        return regionMapper.getSubIdsByRegionIdsAndType(regionIds, regionType,queryInvestBigRegion);
    }

 }
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointFinancialDataMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointFinancialDataMapper.java
@@ -0,0 +1,33 @@
+package com.cool.store.mapper;
+
+import com.cool.store.entity.PointFinancialDataDO;
+import io.lettuce.core.dynamic.annotation.Param;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+public interface PointFinancialDataMapper extends Mapper<PointFinancialDataDO> {
+
+    /**
+     * 新增点位财务数据
+     * @param pointFinancialDataDO 点位财务数据对象
+     * @return 插入记录数
+     */
+    int insertPointFinancialData(PointFinancialDataDO pointFinancialDataDO);
+
+    /**
+     * 修改点位财务数据
+     * @param pointFinancialDataDO 点位财务数据对象
+     * @return 更新记录数
+     */
+    int updatePointFinancialData(PointFinancialDataDO pointFinancialDataDO);
+
+    /**
+     * 根据点位ID查询点位财务数据
+     * @param pointId 点位ID
+     * @return 点位财务数据对象
+     */
+    PointFinancialDataDO selectByPointId(@Param("pointId") Long pointId);
+
+
+}
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointInfoMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointInfoMapper.java
@@ -4,10 +4,12 @@ import com.cool.store.dto.MiniShopDTO;
 import com.cool.store.dto.PCPointListDTO;
 import com.cool.store.dto.PointInfoDTO;
 import com.cool.store.dto.point.LineCountDTO;
+import com.cool.store.dto.point.PointStatisticsDTO;
 import com.cool.store.entity.PointInfoDO;
 import com.cool.store.request.*;
 import com.cool.store.vo.point.MiniPointPageVO;
 import com.cool.store.vo.point.PointHomePageDataVO;
+import com.cool.store.vo.point.PointMapVO;
 import com.cool.store.vo.point.PointPageVO;
 import com.github.pagehelper.Page;
 import org.apache.ibatis.annotations.Param;
@@ -68,6 +70,21 @@ public interface PointInfoMapper extends Mapper<PointInfoDO> {
     */
    Page<PCPointListDTO> getTeamPointPage(@Param("eid")String eid,@Param("request") AllPointPageRequest request);

+    /**
+     * 获取所有的铺位 地图
+     * @param eid
+     * @param request
+     * @return
+     */
+    List<PointMapVO> getAllPointList(@Param("eid")String eid, @Param("request") PointMapRequest request);
+
+    /**
+     * 获取铺位统计数据
+     * @param eid
+     * @param request
+     * @return
+     */
+    PointStatisticsDTO getTeamCount(@Param("eid")String eid, @Param("request") AllPointPageRequest request);
    /**
     * 回收铺位
     * @param pointId
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java
@@ -120,6 +120,8 @@ public interface RegionMapper {
    List<RegionDO> getSubRegionByParentIdsAndRegionType( @Param("parentIds")List<Long> parentIds, @Param("regionType")String regionType);


-    List<String> getSubIdsByRegionIdsAndType(@Param("regionIds") List<String> regionIds, @Param("regionType")String regionType);
+    List<String> getSubIdsByRegionIdsAndType(@Param("regionIds") List<String> regionIds,
+                                             @Param("regionType")String regionType,
+                                             @Param("queryInvestBigRegion") Boolean queryInvestBigRegion);

 }