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

Merge #32 into master from cc_20260113_open

Browse Source 
开业日期报备

* cc_20260113_open: (15 commits squashed)

  - feat:阶段调整

  - feat:开业阶段调整

  - feat:开业日期报备

  - feat:开业日期报备代办

  - feat:文本通知

  - feat:数据处理

  - fix:bug

  - feat:通知功能

  - Merge branch 'master' into cc_20260113_open
    
    # Conflicts:
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java

  - feat:开业代办新增代办预计开业时间

  - feat:开业时间查询

  - feat:开业

  - feat:PC计划开业时间

  - Merge branch 'master' into cc_20260113_open
    
    # Conflicts:
    #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java

  - Merge branch 'master' into cc_20260113_open
    
    # Conflicts:
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java

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/32
This commit is contained in:
正新
2026-01-23 06:49:50 +00:00
parent 41ae24478d
commit 10dca9bf9b
31 changed files with 630 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
View File

@@ -354,6 +354,12 @@ public class ShopStageInfoDAO {
return shopStageInfoMapper.getSpecialShopStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, authRegionIds,ownShopFlag, deskRequest, operationsConsultantUserId);
}
public List<ShopStageInfoDO> getOperationsConsultantStageInfo(List<Long> shopIds, Integer shopSubStage,
List<Integer> shopSubStageStatusList,
String investmentUserId, DeskRequest deskRequest) {
return shopStageInfoMapper.getOperationsConsultantStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, deskRequest);
}
/**
* @Auther: wangshuo
* @Date: 2024/5/9

5
coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
View File

@@ -170,8 +170,9 @@ public class StoreDao {
* @param storeId 门店id
* @param storeStatus 门店营业状态
*/
public void updateStoreStatus(String storeId, String storeStatus) {
storeMapper.updateStoreStatus(storeId,storeStatus);
public void updateStoreStatus(String storeId, String storeStatus,Date actualOpenDate) {
if (Objects.isNull(storeId)||Objects.isNull(storeStatus)||Objects.isNull(actualOpenDate))
storeMapper.updateStoreStatus(storeId,storeStatus,actualOpenDate);
}
/**

19
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java
View File

@@ -152,6 +152,25 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
@Param("ownShopFlag") Boolean ownShopFlag,
@Param("request") DeskRequest deskRequest,
@Param("operationsConsultantUserId") String operationsConsultantUserId);
/**
* 获取运营顾问指定流程的代办数据
* @param shopIds
* @param shopSubStage
* @param shopSubStageStatusList
* @param operationsConsultant
* @param deskRequest
* @return
*/
List<ShopStageInfoDO> getOperationsConsultantStageInfo(@Param("shopIds") List<Long> shopIds,
@Param("shopSubStage") Integer shopSubStage,
@Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList,
@Param("operationsConsultant") String operationsConsultant,
@Param("request") DeskRequest deskRequest);
List<ShopStageInfoDO> getSubStageList(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);
List<ShopStageInfoDO> getSubStages(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);

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

@@ -93,7 +93,9 @@ public interface StoreMapper {
* @param storeId 门店id
* @param storeStatus 门店营业状态
*/
void updateStoreStatus(@Param("storeId") String storeId, @Param("storeStatus") String storeStatus);
void updateStoreStatus(@Param("storeId") String storeId,
@Param("storeStatus") String storeStatus,
@Param("actualOpenDate") Date actualOpenDate);
/**
* 门店状态改为闭店