diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java index 7bbb03f77..a210ffa1a 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java @@ -341,7 +341,7 @@ public class RedisConstant { * 建店资料总部订货收款账户信息 */ public static final String BUILD_RECEIVE_BANK_INFO = "zxjp_build_receive_bank_info"; - + /** * 加盟线下收款银行默认配置 */ @@ -352,6 +352,12 @@ public class RedisConstant { */ public static final String TP_PENALTY_APPLY_IMPORT_LOCK = "tp_penalty_apply_import_lock"; + /** + * 十二分审批按钮权限id + */ + public static final String TP_AUDIT_AUTH_MENU_ID = "tp_audit_auth_menu_id"; + + public static final String STANDARD_STORE_PAY_LOCK_KEY = "standard_store_pay_lock_key:{0}"; /** diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java index 576928f44..defb4596d 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java @@ -38,6 +38,7 @@ public enum RocketMqGroupEnum { STORE_MASTER_ISSUE("store_master_issue", new ArrayList<>(Arrays.asList(RocketMqTagEnum.STORE_MASTER_ISSUE))), VISIT_RECORD_INVALID("visit_record_invalid", new ArrayList<>(Arrays.asList(RocketMqTagEnum.VISIT_RECORD_INVALID))), + TP_PENALTY_APPEAL_OVERDUE("tp_penalty_appeal_overdue", new ArrayList<>(Arrays.asList(RocketMqTagEnum.TP_PENALTY_APPEAL_OVERDUE))), ; private final String group; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java index 90a73f27e..72a14d4c1 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java @@ -22,6 +22,7 @@ public enum RocketMqTagEnum { DELAY_SHOP_DECORATION_ASSIGN("shop_decoration_assign","门店装修分配"), STORE_MASTER_ISSUE("store_master_issue","门店主数据下发"), VISIT_RECORD_INVALID("visit_record_invalid", "拜访记录失效"), + TP_PENALTY_APPEAL_OVERDUE("tp_penalty_appeal_overdue", "十二分惩处单复议逾期"), ; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/tp/TpAuditRecordDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/tp/TpAuditRecordDAO.java index 8299713ce..97a61587c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/tp/TpAuditRecordDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/tp/TpAuditRecordDAO.java @@ -137,48 +137,13 @@ public class TpAuditRecordDAO { * @param applyId 申请单id * @return 审批记录列表 */ - public List getAuditRecordList(Long applyId) { + public List getAuditRecordList(Long applyId) { Example example = new Example(TpAuditRecordDO.class); example.createCriteria() .andEqualTo("applyId", applyId) - .andNotEqualTo("auditStatus", 0) .andEqualTo("deleted", 0); example.setOrderByClause("create_time ASC"); - List recordList = tpAuditRecordMapper.selectByExample(example); - List result = new ArrayList<>(); - for (TpAuditRecordDO auditRecordDO : recordList) { - AuditInfoResponse response = AuditInfoResponse.builder() - .type(getAuditInfoType(auditRecordDO)) - .execute(auditRecordDO.getRecordType() - 1) - .status(CommonConstants.INDEX_ZERO.equals(auditRecordDO.getAuditStatus()) ? 0 : 1) - .createTime(auditRecordDO.getReceiveTaskTime()) - .remark(auditRecordDO.getRemark()) - .actualUserId(auditRecordDO.getHandlerUserId()) - .build(); - List auditUserList = Collections.singletonList( - new AuditInfoResponse.AuditUserInfoVO(auditRecordDO.getHandlerUserId(), auditRecordDO.getHandlerUserName(), null) - ); - response.setList(auditUserList); - result.add(response); - } - return result; - } - - private Integer getAuditInfoType(TpAuditRecordDO auditRecordDO) { - if (CommonConstants.INDEX_ONE.equals(auditRecordDO.getRecordType())) { - return OperationLogAuditEnum.SUBMIT_AUDIT.getCode(); - } else { - switch (auditRecordDO.getAuditStatus()) { - case 0: - return OperationLogAuditEnum.WAIT_AUDIT.getCode(); - case 1: - return OperationLogAuditEnum.PASS.getCode(); - case 2: - return OperationLogAuditEnum.REFUSE.getCode(); - default: - return null; - } - } + return tpAuditRecordMapper.selectByExample(example); } /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java index adb5e668e..ac4b6c6bf 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java @@ -1,6 +1,7 @@ package com.cool.store.mapper; import com.cool.store.dto.UserRoleDTO; +import com.cool.store.dto.openPreparation.UserNameDTO; import com.cool.store.dto.store.StoreUserDTO; import com.cool.store.entity.EnterpriseUserRole; import com.cool.store.entity.SysRoleDO; @@ -115,6 +116,8 @@ public interface SysRoleMapper { */ List getPositionUserIds( @Param("positionIds") List positionIds); + List getPositionUsers(@Param("positionIds") List positionIds); + List selectUserRoleBySourceAndUserId(@Param("source") String source , @Param("userIdList") List userIdList); diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml index c27321ab5..e149e818c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml @@ -296,6 +296,17 @@ and eu.active = true + +