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

fix

Browse Source
This commit is contained in:
shuo.wang
2024-10-13 10:38:58 +08:00
parent 3c57954256
commit 494b74bf0f
5 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
coolstore-partner-common/src/main/java/com/cool/store/enums/AuditExecuteEnum.java Normal file
View File

@@ -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;
}
}

9
coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml
View File

@@ -412,8 +412,13 @@
region_${enterpriseId}
where
deleted = 0
and
<foreach collection="regionIds" separator=" or " open="(" close=")" item="region" > region_path like concat("%/", #{region}, "/%")</foreach>
<if test="regionIds != null and regionIds.size() >0">
and
<foreach collection="regionIds" separator=" or " open="(" close=")" item="region">region_path like
concat("%/", #{region}, "/%")
</foreach>
</if>
</select>

2
coolstore-partner-model/src/main/java/com/cool/store/response/AuditInfoResponse.java
View File

@@ -23,6 +23,8 @@ public class AuditInfoResponse {
private List<AuditUserInfoVO> list;
@ApiModelProperty("操作类型 0 提交审批 1-审批通过 2 审批不通过 3-待审批")
private Integer type;
@ApiModelProperty("执行职位，0-加盟商提交，1-运营初审，2-总部受理")
private Integer execute;
@ApiModelProperty("是否处理：0-未处理,1-处理")
private Integer status;
@ApiModelProperty("生成时间")

21
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java
View File

@@ -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<AuditInfoResponse> getAuditInfo(Long shopId, List<Integer> shopSubStageList) {
List<AuditInfoResponse> responses = new ArrayList<>();
List<OperationLogDO> logList = operationLogDAO.getByShopSubStage(shopId, shopSubStageList, null);
Map<Date,List<OperationLogDO>> operationLogMap = logList.stream().collect(Collectors.groupingBy(OperationLogDO::getCreateTime));
Map<Date, List<OperationLogDO>> operationLogMap = logList.stream().collect(Collectors.groupingBy(OperationLogDO::getCreateTime));
for (Date date : operationLogMap.keySet()) {
List<OperationLogDO> 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());
}

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
View File

@@ -233,7 +233,6 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
for (String regionId : regionIds) {
regionIdList.add(Long.parseLong(regionId));
}
List<Long> subRegionIdsByRegionIdList = regionMapper.getSubRegionIdsByRegionIdList(request.getRegionIds());
if (CollectionUtils.isNotEmpty(subRegionIdsByRegionIdList)) {
request.setRegionIds(subRegionIdsByRegionIdList);