From 98f55ebbcce815983853bf2d96485a306c5cb051 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 02 九月 2025 14:55:44 +0800
Subject: [PATCH] 订单列表问题
---
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 12 ++++++------
manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java | 1 -
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 5 ++++-
framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java | 2 ++
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index 53ae9e3..48fa339 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -829,7 +829,10 @@
public MemberVO getMember(String id) {
MemberVO member = baseMapper.getVoById(id);
if (Objects.nonNull(member)) {
- member.setFace(cosUtil.getPreviewUrl(member.getFace()));
+ if(StringUtils.isNotBlank(member.getFace()) && !member.getFace().contains("https")){
+ member.setFace(cosUtil.getPreviewUrl(member.getFace()));
+ }
+
}
return member;
}
diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
index 15827e4..8daf8b5 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
@@ -86,6 +86,7 @@
"o.consignee_name AS consigneeName," +
"o.consignee_mobile AS consigneeMobile," +
"o.member_id AS memberId," +
+ "m.nick_name AS nickName," +
" GROUP_CONCAT(oi.goods_id) as group_goods_id," +
" GROUP_CONCAT(oi.sku_id) as group_sku_id," +
" GROUP_CONCAT(oi.num) as group_num" +
@@ -99,6 +100,7 @@
",GROUP_CONCAT(oi.is_refund) as group_is_refund " +
",GROUP_CONCAT(oi.refund_price) as group_refund_price " +
" FROM li_order o LEFT JOIN li_order_item AS oi on o.sn = oi.order_sn " +
+ "LEFT JOIN li_member m on m.id = o.member_id " +
"${ew.customSqlSegment}")
IPage<OrderSimpleVO> queryByParams(IPage<OrderSimpleVO> page, @Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index ac37897..a0a526b 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -265,12 +265,12 @@
}
}
- for (OrderSimpleVO vo : page.getRecords()){
- Member member = memberMapperMapper.selectById(vo.getMemberId());
- if (member != null){
- vo.setNickName(member.getNickName());
- }
- }
+// for (OrderSimpleVO vo : page.getRecords()){
+// Member member = memberMapperMapper.selectById(vo.getMemberId());
+// if (member != null){
+// vo.setNickName(member.getNickName());
+// }
+// }
return page;
}
diff --git a/manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java
index 4e20f62..8da84de 100644
--- a/manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java
@@ -47,7 +47,6 @@
@ApiImplicitParam(name = "id", value = "浼氬憳ID", required = true, dataType = "String", paramType = "path")
@GetMapping(value = "/{id}")
public ResultMessage<MemberVO> get(@PathVariable String id) {
-
return ResultUtil.data(memberService.getMember(id));
}
--
Gitblit v1.8.0