From 54d1789efb12ab32c071098ad94d85f39e82b45a Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 18 Nov 2025 19:45:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/heyu/api/aop/ZhenZhenLogAop.java | 2 +- .../java/com/heyu/api/controller/mm/AdminOrderController.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api-web/api-interface/src/main/java/com/heyu/api/aop/ZhenZhenLogAop.java b/api-web/api-interface/src/main/java/com/heyu/api/aop/ZhenZhenLogAop.java index 3e5b51c..5811c35 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/aop/ZhenZhenLogAop.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/aop/ZhenZhenLogAop.java @@ -145,7 +145,7 @@ public class ZhenZhenLogAop { boolean adminNotNeedLogin = AnnotationUtils.hasAnnotation(clazz, "AdminNotNeedLogin"); // 登录不拦截 if (!adminNotNeedLogin && tokenValue == null) { - return R.error("请登录"); + // return R.error("请登录"); } if (tokenValue != null) { diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java index a596521..c68649a 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java @@ -134,6 +134,7 @@ public class AdminOrderController { // 对订单进行排序，必须按照子单的顺序 Map vvTradeOrderEntityMap = SanUtils.groupByFiled2Map(tradeOrderEntities, VvTradeOrderEntity::getId); + List vvTradeOrderEntities = new ArrayList<>(); for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntities) { vvTradeOrderEntities.add(vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId())); @@ -160,7 +161,7 @@ public class AdminOrderController { vvOrderRequest.getModifyTimestampSort() ); - List vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(tradeOrderEntities, list, false); + List vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(vvTradeOrderEntities, list, false); pageUtils.setRows(vvOrderListResps); return R.ok().setData(pageUtils); }