diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditExecuteEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditExecuteEnum.java index 3c86ed446..fd7a8c127 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditExecuteEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditExecuteEnum.java @@ -9,7 +9,8 @@ package com.cool.store.enums; public enum AuditExecuteEnum { FRANCHISEES(0, "加盟商提交"), OPERATION(1, "运营初审"), - HEADQUARTERS(2, "总部受理"); + HEADQUARTERS(2, "总部受理"), + MANAGER(3, "待招商副总裁审核"); private int code; private String desc; AuditExecuteEnum(int code, String desc) { diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java index 2b0be8433..e0b5d847d 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java @@ -75,9 +75,13 @@ public enum UserRoleEnum { INVESTMENT_MANGER(1765266125369L, "招商经理"), OPERATION_GENERAL_CONSULTANT(1764642515446L,"运营片区总顾问"), ORDER_GROUP(1766387359609L,"订单组"), + + DELIVERY_SPECIALIST(1767591430954L,"外卖专员"), AI_STORE_TYPE_APPROVE(1774252055402L,"AI店型订单审核"), DEVICE_SHIPMENT_HM(1775108261858L,"设备发货-火码"), - DEVICE_SHIPMENT_CG(1775108280524L,"设备发货-采购") + DEVICE_SHIPMENT_CG(1775108280524L,"设备发货-采购"), + OPERATION_VICE_PRESIDENT(1778035765077L, "运营副总裁"), + INVESTMENT_PRESIDENT(1778053561302L, "招商副总裁"), ; private Long code; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java index a706ab31c..3d4df4927 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java @@ -21,7 +21,8 @@ public enum ShopSubStageStatusEnum { //上传租赁合同 SHOP_SUB_STAGE_STATUS_20(ShopSubStageEnum.SHOP_STAGE_2, 200, "待加盟商上传", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_21(ShopSubStageEnum.SHOP_STAGE_2, 210, "待招商经理审核", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_21(ShopSubStageEnum.SHOP_STAGE_2, 210, "待招商片区老总审核", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_21_5(ShopSubStageEnum.SHOP_STAGE_2, 215, "待分部内勤审核", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_22(ShopSubStageEnum.SHOP_STAGE_2, 220, "审核未通过", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_23(ShopSubStageEnum.SHOP_STAGE_2, 230, "审核通过", Boolean.TRUE), @@ -50,6 +51,7 @@ public enum ShopSubStageStatusEnum { //加盟合同签约 SHOP_SUB_STAGE_STATUS_80(ShopSubStageEnum.SHOP_STAGE_8, 800, "待加盟内勤/大区内勤提交", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_83(ShopSubStageEnum.SHOP_STAGE_8, 830, "待分部内勤审核", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_83_2(ShopSubStageEnum.SHOP_STAGE_8, 832, "待招商副总裁审核", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_83_5(ShopSubStageEnum.SHOP_STAGE_8, 835, "待财务审核", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_84(ShopSubStageEnum.SHOP_STAGE_8, 840, "已签约", Boolean.TRUE), SHOP_SUB_STAGE_STATUS_85(ShopSubStageEnum.SHOP_STAGE_8, 850, "审核失败", Boolean.FALSE), @@ -90,7 +92,7 @@ public enum ShopSubStageStatusEnum { //平台资料提交 SHOP_SUB_STAGE_STATUS_150(ShopSubStageEnum.SHOP_STAGE_15, 1500, "待加盟商提交", Boolean.FALSE), // 2025-12-26 加盟开店管理流程调整,新增“待运营顾问审核”,删除1520、1530、1540、1550阶段, - SHOP_SUB_STAGE_STATUS_150_5(ShopSubStageEnum.SHOP_STAGE_15, 1505, "待运营顾问审核", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_150_5(ShopSubStageEnum.SHOP_STAGE_15, 1505, "待招商经理审核", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_151(ShopSubStageEnum.SHOP_STAGE_15, 1510, "待圆规物流填写", Boolean.FALSE), // ----- 以下子阶段删除 ----- SHOP_SUB_STAGE_STATUS_152(ShopSubStageEnum.SHOP_STAGE_15, 1520, "待财务填写",Boolean.FALSE), diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopDecorationLogDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopDecorationLogDAO.java new file mode 100644 index 000000000..c68ee1181 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopDecorationLogDAO.java @@ -0,0 +1,32 @@ +package com.cool.store.dao; + +import com.cool.store.entity.ShopDecorationLogDO; +import com.cool.store.mapper.ShopDecorationLogMapper; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 门店装修修改记录 DAO + */ +@Repository +public class ShopDecorationLogDAO { + + @Resource + private ShopDecorationLogMapper shopDecorationLogMapper; + + /** + * 插入修改记录 + */ + public int insert(ShopDecorationLogDO record) { + return shopDecorationLogMapper.insertSelective(record); + } + + /** + * 通过门店ID查询所有修改记录(按时间倒序) + */ + public List listByShopIdOrderByTimeDesc(Long shopId) { + return shopDecorationLogMapper.listByShopIdOrderByTimeDesc(shopId); + } +} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index 79612c35d..357cddf82 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -270,10 +270,11 @@ public class ShopStageInfoDAO { return shopStageInfoMapper.updateShopStageAndAuditInfo(shopId, shopStageInfo.getShopSubStageEnum().getShopSubStage(), shopStageInfo.getShopSubStageStatus(), isTerminated, remark, auditId); } - public Page getRentContractToDoPage(String userId, Integer pageNum, Integer pageSize) { + public Page getRentContractToDoPage(String userId, Integer pageNum, Integer pageSize,List authRegionIds) { PageHelper.startPage(pageNum, pageSize); ShopSubStageStatusEnum shopSubStageStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21; - return shopStageInfoMapper.getRentContractToDoPage(userId, shopSubStageStatus.getShopSubStageEnum().getShopSubStage(), shopSubStageStatus.getShopSubStageStatus()); + return shopStageInfoMapper.getRentContractToDoPage(userId, shopSubStageStatus.getShopSubStageEnum().getShopSubStage(), + shopSubStageStatus.getShopSubStageStatus(),authRegionIds); } public List getShopIdListByStageStatus(Integer shopSubStageStatus) { diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopDecorationLogMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopDecorationLogMapper.java new file mode 100644 index 000000000..fea75b5ae --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopDecorationLogMapper.java @@ -0,0 +1,18 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.ShopDecorationLogDO; +import org.apache.ibatis.annotations.Param; +import tk.mybatis.mapper.common.Mapper; + +import java.util.List; + +/** + * 门店装修修改记录表 Mapper + */ +public interface ShopDecorationLogMapper extends Mapper { + + /** + * 通过门店ID查询所有修改记录(按时间倒序) + */ + List listByShopIdOrderByTimeDesc(@Param("shopId") Long shopId); +} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java index 85d1e0ab2..411a0c2f0 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java @@ -116,7 +116,10 @@ public interface ShopStageInfoMapper extends Mapper { * @param userId * @return */ - Page getRentContractToDoPage(@Param("userId") String userId, @Param("shopSubStage")Integer shopSubStage, @Param("shopSubStageStatus") Integer shopSubStageStatus); + Page getRentContractToDoPage(@Param("userId") String userId, + @Param("shopSubStage")Integer shopSubStage, + @Param("shopSubStageStatus") Integer shopSubStageStatus, + @Param("authRegionIds") List authRegionIds); List getShopIdListByStageStatus(@Param("shopSubStageStatus") Integer shopSubStageStatus); diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopDecorationLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopDecorationLogMapper.xml new file mode 100644 index 000000000..daecc1306 --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopDecorationLogMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index 31dd16a23..c3bbff23e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -244,8 +244,17 @@ inner join xfsg_line_info b on a.line_id = b.id left join xfsg_shop_info c on a.shop_id = c.id where c.deleted=0 - and a.shop_sub_stage = #{shopSubStage} and a.shop_sub_stage_status = #{shopSubStageStatus} and a.deleted = 0 and - b.deleted = 0 and b.development_manager = #{userId} + and a.shop_sub_stage = #{shopSubStage} + and a.shop_sub_stage_status = #{shopSubStageStatus} + and a.deleted = 0 + and b.deleted = 0 + + and c.invest_region_id in + + #{regionId} + + + order by a.id desc diff --git a/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml index d4ceb8c0e..0bc8a8a8f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml @@ -70,7 +70,8 @@