fix(mall): 修复确认收货功能

Administrator

2025-05-27 09d1fb5dcfa7a8c5fae1c570ec4256d05b82617d

fix(mall): 修复确认收货功能

- 增加了对自提订单的核销状态检查
- 隐藏了标签设置页面的某些元素

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -904,6 +904,16 @@
        if (orderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()) {
            throw new FebsException("该状态不能确认收货");
        }
        if(1 == orderInfo.getDeliveryType()){
            List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectList(
                    new LambdaQueryWrapper<MallOrderItem>()
                            .eq(MallOrderItem::getOrderId, id)
                            .eq(MallOrderItem::getLeaderState, 0)
            );
            if(CollUtil.isNotEmpty(mallOrderItems)){
                throw new FebsException("请先核销"+mallOrderItems.get(0).getGoodsName());
            }
        }

        List<MallRefundEntity> mallRefundEntities = mallRefundMapper.selectByItemIdAndOrderIdAndState(null, orderInfo.getId(), 3);
        if(CollUtil.isNotEmpty(mallRefundEntities)){

 src/main/resources/templates/febs/views/modules/levelView/labelSet.html

@@ -9,17 +9,17 @@
                        </ul>
                        <div class="layui-tab-content">
                            <input type="text" name="labelId"
                                   placeholder="" autoComplete="off" class="layui-input">
                                   placeholder="" autoComplete="off" class="layui-input febs-hide">
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item">
                                    <div id="memberSetMove"></div>
                                </div>
                            </div>
                            <div class="layui-tab-item layui-show">
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="memberSetMoveQuery">
                                    <i class="layui-icon">获取右侧数据</i>
                                </div>
                            </div>
<!--                            <div class="layui-tab-item layui-show">-->
<!--                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="memberSetMoveQuery">-->
<!--                                    <i class="layui-icon">获取右侧数据</i>-->
<!--                                </div>-->
<!--                            </div>-->
                        </div>
                    </div>
                    <div class="layui-form-item febs-hide">