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

Merge #19 into master from cc_20251223_orgChange

Browse Source 
组织架构迁移

* cc_20251223_orgChange: (32 commits squashed)

  - fix:角色枚举值变更

  - fix:待办-缴纳加盟费/保证金中，删除企微督导查询权限，督导查询权限改为招商经理；待办-建店资料中，删除企微督导查询权限

  - fix:开店管理-查询我负责的招商经理或运营顾问为当前用户的；查询我管辖的如果当前用户是招商经理则查招商区域

  - feat:组织架构切换调整

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

  - feat:门店详情新增招商所属大区 运营顾问

  - fix:获取可选择的大区新增type字段

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

  - feat:修改招商所属大区

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

  - feat:新增分店 修改分店

  - feat:operations_consultant

  - fix:获取平台建店左侧小窗详情接口新增招商区域名称字段

  - feat:合同开始之后需要分配才能触发后续阶段

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

  - fix:新增招商区域名称字段

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

  - fix:大区查询添加enableFlag字段

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

  - fix:代办查询bug修改

  - fix:字段缺失补充

  - Merge branch 'master' into cc_20251223_orgChange
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java

  - fix:修改基本资料bug

  - fix:线索列表接口新增招商所属区域名称字段

  - fix:加盟商资质审核通过自动建店时带出招商所属区域

  - fix:补充提交

  - fix:修改开店详情接口修改招商所属区域

  - fix:工作台待办返回招商区域名称字段

  - fix:开店详情接口招商所属区域id为0的数据返回null

  - fix:字段补充

  - fix:招商所属大区字段补充

  - fix:字段补充

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/19
This commit is contained in:
王非凡
2025-12-31 06:56:47 +00:00
committed by 苏竹红
parent 4b7a35c96c
commit e34aea7a40
52 changed files with 669 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/BigRegionDAO.java
View File

@@ -27,8 +27,8 @@ public class BigRegionDAO {
@Resource
BigRegionMapper bigRegionMapper;
public List<BigRegionDTO> queryAllBigRegion(String keyword, Integer joinBrand){
return bigRegionMapper.queryAllBigRegion(keyword, joinBrand);
public List<BigRegionDTO> queryAllBigRegion(String keyword, Integer joinBrand,Integer type){
return bigRegionMapper.queryAllBigRegion(keyword, joinBrand,type);
}
public BigRegionDO queryOrgInfoByBigRegionAndJoinMode(Long regionId, Integer joinMode){

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
View File

@@ -194,11 +194,11 @@ public class LineInfoDAO {
return lineMobile.stream().filter(o->StringUtils.isNotBlank(o.getMobile())).collect(Collectors.toMap(LineInfoDO::getId, LineInfoDO::getMobile, (k1, k2)-> k1));
}
public Integer batchUpdateInvestmentManager( List<Long> lineIds, Integer status, String investmentManager,Long regionId){
public Integer batchUpdateInvestmentManager( List<Long> lineIds, Integer status, String investmentManager,Long regionId,Long investRegionId){
if(CollectionUtils.isEmpty(lineIds)|| status == null|| StringUtils.isBlank(investmentManager) || regionId == null){
return 0;
}
return lineInfoMapper.batchUpdateInvestmentManager(lineIds, status, investmentManager,regionId);
return lineInfoMapper.batchUpdateInvestmentManager(lineIds, status, investmentManager,regionId,investRegionId);
}
public List<LineVO> getLines(String keyword){

67
coolstore-partner-dao/src/main/java/com/cool/store/dao/OperationsConsultantAssignDAO.java Normal file
View File

@@ -0,0 +1,67 @@
package com.cool.store.dao;
import com.cool.store.entity.OperationsConsultantAssignDO;
import com.cool.store.mapper.OperationsConsultantAssignMapper;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import java.util.List;
/**
* @Auther zx_szh
* @Date 2025/12/25 14:29
* @Version 1.0
*/
@Repository
public class OperationsConsultantAssignDAO {
@Resource
private OperationsConsultantAssignMapper operationsConsultantAssignMapper;
/**
* 新增分配数据
* @param operationsConsultantAssignDO
* @return
*/
public Integer addOperationsConsultantAssign(OperationsConsultantAssignDO operationsConsultantAssignDO){
return operationsConsultantAssignMapper.insertSelective(operationsConsultantAssignDO);
}
/**
* 根据Id更新数据
* @param operationsConsultantAssignDO
* @return
*/
public Integer updateById(OperationsConsultantAssignDO operationsConsultantAssignDO){
return operationsConsultantAssignMapper.updateByPrimaryKey(operationsConsultantAssignDO);
}
/**
* 根据门店信息查询分配信息
* @param shopId
* @return
*/
public OperationsConsultantAssignDO selectByShopId(Long shopId){
if(shopId == null){
return null;
}
return operationsConsultantAssignMapper.selectByShopId(shopId);
}
/**
* 获取未分配的数据
* @param keyword
* @return
*/
public List<OperationsConsultantAssignDO> getNoAssign(String keyword,List<String> regionIds){
return operationsConsultantAssignMapper.getNoAssign(keyword,regionIds);
}
}

9
coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDao.java
View File

@@ -9,6 +9,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import tk.mybatis.mapper.entity.Example;
@@ -213,4 +214,12 @@ public class RegionDao {
}
return regionMapper.getSubRegionByParentIdsAndRegionType(parentIdList, regionType);
}
public List<String> getSubIdsByRegionIdsAndType(List<String> regionIds,String regionType){
if (CollectionUtils.isEmpty(regionIds)){
return Lists.newArrayList();
}
return regionMapper.getSubIdsByRegionIdsAndType(regionIds, regionType);
}
}

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/BigRegionMapper.java
View File

@@ -15,7 +15,7 @@ public interface BigRegionMapper extends Mapper<BigRegionDO> {
* @param keyword
* @return
*/
List<BigRegionDTO> queryAllBigRegion(@Param("keyword") String keyword, @Param("joinBrand") Integer joinBrand);
List<BigRegionDTO> queryAllBigRegion(@Param("keyword") String keyword, @Param("joinBrand") Integer joinBrand, @Param("type") Integer type);
/**
* 根据所属大区与加盟模式查询新管家信息

4
coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java
View File

@@ -126,7 +126,9 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
*/
Integer batchUpdateInvestmentManager(@Param("lineIds") List<Long> lineIds,
@Param("status") Integer status,
@Param("investmentManager") String investmentManager, @Param("regionId") Long regionId);
@Param("investmentManager") String investmentManager,
@Param("regionId") Long regionId,
@Param("investRegionId") Long investRegionId);
List<LineVO> getLinesByKeyword(@Param("keyword") String keyword);

28
coolstore-partner-dao/src/main/java/com/cool/store/mapper/OperationsConsultantAssignMapper.java Normal file
View File

@@ -0,0 +1,28 @@
package com.cool.store.mapper;
import com.cool.store.entity.OperationsConsultantAssignDO;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
public interface OperationsConsultantAssignMapper extends Mapper<OperationsConsultantAssignDO> {
/**
* 根据门店查询运营顾问分配信息
* @param shopId
* @return
*/
OperationsConsultantAssignDO selectByShopId(Long shopId);
/**
* 获取待分配
* @param keyword
* @return
*/
List<OperationsConsultantAssignDO> getNoAssign(@Param("keyword") String keyword, @Param("regionIds") List<String> regionIds);
}

4
coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java
View File

@@ -118,4 +118,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);
}