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 new file mode 100644 index 000000000..3c86ed446 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditExecuteEnum.java @@ -0,0 +1,25 @@ +package com.cool.store.enums; + +/** + * @Author: WangShuo + * @Date: 2024/10/13/上午10:26 + * @Version 1.0 + * @注释: + */ +public enum AuditExecuteEnum { + FRANCHISEES(0, "加盟商提交"), + OPERATION(1, "运营初审"), + HEADQUARTERS(2, "总部受理"); + private int code; + private String desc; + AuditExecuteEnum(int code, String desc) { + this.code = code; + this.desc = desc; + } + public int getCode() { + return code; + } + public String getDesc() { + return desc; + } +} diff --git a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml index 15034bbab..5fe8bbfee 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml @@ -412,8 +412,13 @@ region_${enterpriseId} where deleted = 0 - and - region_path like concat("%/", #{region}, "/%") + + and + region_path like + concat("%/", #{region}, "/%") + + + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AuditInfoResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AuditInfoResponse.java index 17e5aa3a4..6fb05d89a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/AuditInfoResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AuditInfoResponse.java @@ -23,6 +23,8 @@ public class AuditInfoResponse { private List list; @ApiModelProperty("操作类型 0 提交审批 1-审批通过 2 审批不通过 3-待审批") private Integer type; + @ApiModelProperty("执行职位,0-加盟商提交,1-运营初审,2-总部受理") + private Integer execute; @ApiModelProperty("是否处理:0-未处理,1-处理") private Integer status; @ApiModelProperty("生成时间") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java index af4908faa..eb521ccab 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java @@ -8,10 +8,7 @@ import com.cool.store.dto.OperationLogDTO; import com.cool.store.entity.EnterpriseUserDO; import com.cool.store.entity.OperationLogDO; import com.cool.store.entity.ShopAuditInfoDO; -import com.cool.store.enums.AuditResultTypeEnum; -import com.cool.store.enums.OperationLogAuditEnum; -import com.cool.store.enums.OperationStatusEnum; -import com.cool.store.enums.OperationTypeEnum; +import com.cool.store.enums.*; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.response.AuditInfoResponse; import com.cool.store.service.OperationLogService; @@ -83,7 +80,7 @@ public class OperationLogServiceImpl implements OperationLogService { public List getAuditInfo(Long shopId, List shopSubStageList) { List responses = new ArrayList<>(); List logList = operationLogDAO.getByShopSubStage(shopId, shopSubStageList, null); - Map> operationLogMap = logList.stream().collect(Collectors.groupingBy(OperationLogDO::getCreateTime)); + Map> operationLogMap = logList.stream().collect(Collectors.groupingBy(OperationLogDO::getCreateTime)); for (Date date : operationLogMap.keySet()) { List operations = operationLogMap.get(date); AuditInfoResponse auditInfoResponse = new AuditInfoResponse(); @@ -97,6 +94,7 @@ public class OperationLogServiceImpl implements OperationLogService { operationType = operationLogDO.getType(); auditInfoResponse.setType(OperationLogAuditEnum.SUBMIT_AUDIT.getCode()); auditInfoResponse.setStatus(operationLogDO.getStatus()); + auditInfoResponse.setExecute(AuditExecuteEnum.FRANCHISEES.getCode()); AuditInfoResponse.AuditUserInfoVO user = new AuditInfoResponse.AuditUserInfoVO(); user.setUserId(operationLogDO.getOperator()); user.setName(operationLogDO.getOperatorName()); @@ -107,6 +105,17 @@ public class OperationLogServiceImpl implements OperationLogService { } //审批 if (operationLogDO.getType().equals(OperationTypeEnum.OPERATION_TYPE_1.getCode())) { + if (operationLogDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181.getShopSubStageStatus()) + || operationLogDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_193.getShopSubStageStatus()) + || operationLogDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201.getShopSubStageStatus()) + || operationLogDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_213.getShopSubStageStatus()) + || operationLogDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221.getShopSubStageStatus()) + ) { + auditInfoResponse.setExecute(AuditExecuteEnum.HEADQUARTERS.getCode()); + }else { + auditInfoResponse.setExecute(AuditExecuteEnum.OPERATION.getCode()); + } + operationType = operationLogDO.getType(); userIds.add(operationLogDO.getOperator()); if (Objects.isNull(operationLogDO.getUpdateTime())) { @@ -151,7 +160,7 @@ public class OperationLogServiceImpl implements OperationLogService { } responses.add(auditInfoResponse); } - return responses.stream().sorted(Comparator.comparing(AuditInfoResponse::getCreateTime)).collect(Collectors.toList()); + return responses.stream().sorted(Comparator.comparing(AuditInfoResponse::getCreateTime)).collect(Collectors.toList()); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java index 6f6e592a1..ac96ebbdc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java @@ -233,7 +233,6 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { for (String regionId : regionIds) { regionIdList.add(Long.parseLong(regionId)); } - List subRegionIdsByRegionIdList = regionMapper.getSubRegionIdsByRegionIdList(request.getRegionIds()); if (CollectionUtils.isNotEmpty(subRegionIdsByRegionIdList)) { request.setRegionIds(subRegionIdsByRegionIdList);