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/ApiMallTeamLeaderServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 734aa7a..8c2676e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -710,7 +710,7 @@
List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectList(
new LambdaQueryWrapper<MallOrderItem>()
.eq(MallOrderItem::getOrderId, mallOrderInfo.getId())
- .eq(MallOrderItem::getLeaderState, StateUpDownEnum.DOWN.getCode())
+// .eq(MallOrderItem::getLeaderState, StateUpDownEnum.DOWN.getCode())
);
if(CollUtil.isNotEmpty(mallOrderItems)){
for(MallOrderItem item : mallOrderItems){
@@ -721,6 +721,7 @@
apiHappyOrderLeaderVo.setOrderId(mallOrderInfo.getId());
apiHappyOrderLeaderVo.setOrderState(mallOrderInfo.getStatus());
apiHappyOrderLeaderVo.setTakeCode(takeCode);
+ apiHappyOrderLeaderVo.setItemId(item.getId());
apiHappyOrderLeaderVo.setGoodsName(item.getGoodsName());
apiHappyOrderLeaderVo.setGoodsSku(item.getSkuName());
apiHappyOrderLeaderVo.setGoodsCnt(item.getCnt());
@@ -751,6 +752,10 @@
if(mallOrderInfo == null){
throw new FebsException("订单不存在！");
}
+ if(mallOrderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()){
+ throw new FebsException("订单不是待收货状态！");
+ }
+
MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(mallOrderInfo.getTakeUniqueCode());
if(mallTeamLeader==null){
--
Gitblit v1.9.1