From 2701dca44e1972afe9956ced2f949d2998c1bb4b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:00:45 +0800
Subject: [PATCH] 客户管理详情
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/CustomerServiceImpl.java | 12 ++++++++----
framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java | 6 ++++++
framework/src/main/java/cn/lili/modules/lmk/service/CustomerService.java | 2 +-
manager-api/src/main/java/cn/lili/controller/lmk/CustomerController.java | 5 +++++
framework/src/main/resources/mapper/lmk/CustomerMapper.xml | 22 ++++++++++------------
5 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/CustomerService.java b/framework/src/main/java/cn/lili/modules/lmk/service/CustomerService.java
index 1f6eb4e..112ee70 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/CustomerService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/CustomerService.java
@@ -34,7 +34,7 @@
* @param id 浼氬憳id
* @return 鐢ㄦ埛VO
*/
- MemberVO getMember(String id);
+ Result getMember(String id);
/**
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
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java
index 8aafe40..5aba29d 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java
@@ -100,6 +100,12 @@
@ApiModelProperty(value = "瀹㈡埛鏍囩鍒楄〃")
private List<CustomerTagVO> customerTagList;
+ /**
+ * 涓簄ull鍒欎笉鍦ㄩ粦鍚嶅崟鍐�
+ */
+ @ApiModelProperty(value = "榛戝悕鍗昳d")
+ private String blackId;
+
public MemberVO(Member member) {
BeanUtil.copyProperties(member, this);
}
diff --git a/framework/src/main/resources/mapper/lmk/CustomerMapper.xml b/framework/src/main/resources/mapper/lmk/CustomerMapper.xml
index 1c484e7..d98bcd8 100644
--- a/framework/src/main/resources/mapper/lmk/CustomerMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/CustomerMapper.xml
@@ -26,6 +26,7 @@
<result property="gradeId" column="grade_id"/>
<result property="experience" column="experience"/>
<result property="createTime" column="create_time"/>
+ <result property="blackId" column="blackId"/>
<collection property="customerTagList" ofType="cn.lili.modules.lmk.domain.vo.CustomerTagVO"
select="selectTagByMemberId"
column="id"
@@ -34,39 +35,36 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
- *
+ LM.*
FROM
- li_member lm
+ li_member LM
+ LEFT JOIN lmk_customer_black LMK ON LM.id = LMK.user_id and LMK.delete_flag = 0
<where>
<!-- 鐢ㄦ埛鍚嶆ā绯婃煡璇� -->
<if test="query.username != null and query.username != ''">
- AND lm.username LIKE CONCAT('%', #{query.username}, '%')
+ AND LM.username LIKE CONCAT('%', #{query.username}, '%')
</if>
<!-- 鏄电О妯＄硦鏌ヨ -->
<if test="query.nickName != null and query.nickName != ''">
- AND lm.nick_name LIKE CONCAT('%', #{query.nickName}, '%')
+ AND LM.nick_name LIKE CONCAT('%', #{query.nickName}, '%')
</if>
<!-- 鎵嬫満鍙风爜绮剧‘鏌ヨ -->
<if test="query.mobile != null and query.mobile != ''">
- AND lm.mobile = #{query.mobile}
+ AND LM.mobile = #{query.mobile}
</if>
<!-- 浼氬憳鐘舵�佽浆 -->
<if test="query.disabled != null and query.disabled != ''">
- AND lm.disabled = #{query.disabled}
+ AND LM.disabled = #{query.disabled}
</if>
<!-- 鍟嗛摵id -->
<if test="query.storeId != null and query.storeId != ''">
- AND lm.store_id = #{query.storeId}
+ AND LM.store_id = #{query.storeId}
</if>
- AND EXISTS (
- SELECT 1
- FROM li_order lo
- WHERE lo.member_id = lm.id
- )
+ AND LM.delete_flag = 0
</where>
ORDER BY lm.create_time DESC
</select>
diff --git a/manager-api/src/main/java/cn/lili/controller/lmk/CustomerController.java b/manager-api/src/main/java/cn/lili/controller/lmk/CustomerController.java
index 98ee0b1..62a9d02 100644
--- a/manager-api/src/main/java/cn/lili/controller/lmk/CustomerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/lmk/CustomerController.java
@@ -38,6 +38,11 @@
return customerService.getStoreSelectOptions();
}
+ @ApiOperation(value = "鑾峰緱瀹㈡埛璇︽儏")
+ @GetMapping("/{id}")
+ public Result getCustomerInfo(@PathVariable String id){
+ return customerService.getMember(id);
+ }
@ApiOperation(value = "瀹㈡埛鍒嗛〉鍒楄〃")
@GetMapping
--
Gitblit v1.8.0