From 88bd75d93f86d3cf4f12e652d459da8bae71e545 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 15:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/CustomerServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 a52ce67..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
@@ -2,6 +2,7 @@
import cn.lili.base.Result;
+import cn.lili.common.security.context.UserContext;
import cn.lili.modules.lmk.domain.query.CustomerQuery;
import cn.lili.modules.lmk.mapper.CustomerMapper;
import cn.lili.modules.lmk.mapper.LmkStoreMapper;
@@ -10,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;
@@ -20,12 +22,14 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.Objects;
+
@Service
@RequiredArgsConstructor
public class CustomerServiceImpl extends ServiceImpl<MemberMapper, Member> implements CustomerService {
private final CustomerMapper customerMapper;
-
+ private final MemberService memberService;
private final LmkStoreMapper storeMapper;
@Override
@@ -37,8 +41,22 @@
}
@Override
- public MemberVO getMember(String id) {
- return null;
+ public Result getMemberPageByWX(CustomerQuery customerQuery) {
+ String storeId = UserContext.getCurrentUser().getStoreId();
+ if ( storeId == null) {
+ return Result.error("璇ヨ处鍙锋病鏈夋敞鍐屽簵閾�");
+ }
+ return getMemberPage(customerQuery);
+
+ }
+
+
+ @Override
+ public Result getMember(String id) {
+ MemberVO memberVO = memberService.getMember(id);
+ //鏌ヨ鐢ㄦ埛鏍囩
+// memberVO.setCustomerTagList();
+ return Result.ok().data(memberVO);
}
@Override
--
Gitblit v1.8.0