From f8c253e532fcf9f76e02e5e0ede6b4300af44929 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 23 Oct 2025 09:55:19 +0800
Subject: [PATCH] fix(aiApply): 更新权限控制标识 - 将同意、拒绝、解绑按钮的权限标识从 companyList:info 更改为 applyList:view - 确保操作按钮权限控制与实际功能匹配 - 修复因权限标识不一致导致的功能不可用问题
---
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
index e097d74..7393804 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.enumerates.ScoreFlowTypeEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
+import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.ScoreSettingDto;
import cc.mrbird.febs.mall.dto.signActivity.ApiSignDataDto;
import cc.mrbird.febs.mall.dto.signActivity.ApiSignListDto;
@@ -90,11 +91,11 @@
long between = DateUtil.between(startTime, endTime, DateUnit.DAY);
List<ApiGetRunDateVo> apiGetRunDateVos = generateDateList(startTime, between);
+ List<Integer> typeList = Arrays.asList(ScoreFlowTypeEnum.SIGN_SCORE.getValue(), ScoreFlowTypeEnum.SIGN_EXPERIENCE.getValue());
List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowService.getBaseMapper().selectList(
new LambdaQueryWrapper<MallMoneyFlow>()
.eq(MallMoneyFlow::getMemberId, memberId)
- .eq(MallMoneyFlow::getFlowType, FlowTypeEnum.PRIZE_SCORE.getValue())
- .eq(MallMoneyFlow::getType, MoneyFlowTypeEnum.SCORE_SIGN.getValue())
+ .in(MallMoneyFlow::getType, typeList)
.ge(MallMoneyFlow::getCreatedTime, startTime)
.le(MallMoneyFlow::getCreatedTime, endTime)
);
@@ -295,7 +296,7 @@
member.getId(),
amount,
ScoreFlowTypeEnum.SIGN_EXPERIENCE.getValue(),
- mallScoreSignRecord.getId().toString(),
+ MallUtils.getOrderNum("s"),
FlowTypeEnum.SCORE.getValue(),
StrUtil.format(ScoreFlowTypeEnum.SIGN_EXPERIENCE.getDesc(),amount),
2);
@@ -306,7 +307,7 @@
member.getId(),
amount,
ScoreFlowTypeEnum.SIGN_SCORE.getValue(),
- mallScoreSignRecord.getId().toString(),
+ MallUtils.getOrderNum("s"),
FlowTypeEnum.PRIZE_SCORE.getValue(),
StrUtil.format(ScoreFlowTypeEnum.SIGN_SCORE.getDesc(),amount),
2);
--
Gitblit v1.9.1