From 8063ee7eee51bfe25a09428e6efc60f828b270c6 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/CustomerServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/CustomerServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/CustomerServiceImpl.java
index 2e198b1..a8c9d35 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/CustomerServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/CustomerServiceImpl.java
@@ -11,6 +11,7 @@
import cn.lili.modules.member.entity.vo.MemberVO;
import cn.lili.modules.member.mapper.MemberMapper;
+import cn.lili.modules.member.service.MemberService;
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
import cn.lili.utils.PageUtil;
@@ -28,7 +29,7 @@
public class CustomerServiceImpl extends ServiceImpl<MemberMapper, Member> implements CustomerService {
private final CustomerMapper customerMapper;
-
+ private final MemberService memberService;
private final LmkStoreMapper storeMapper;
@Override
@@ -41,7 +42,7 @@
@Override
public Result getMemberPageByWX(CustomerQuery customerQuery) {
- String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
+ String storeId = UserContext.getCurrentUser().getStoreId();
if ( storeId == null) {
return Result.error("璇ヨ处鍙锋病鏈夋敞鍐屽簵閾�");
}
@@ -51,8 +52,11 @@
@Override
- public MemberVO getMember(String id) {
- return null;
+ public Result getMember(String id) {
+ MemberVO memberVO = memberService.getMember(id);
+ //鏌ヨ鐢ㄦ埛鏍囩
+// memberVO.setCustomerTagList();
+ return Result.ok().data(memberVO);
}
@Override
--
Gitblit v1.8.0