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); /** 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 framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java
@@ -100,6 +100,12 @@ @ApiModelProperty(value = "客户标签列表") private List<CustomerTagVO> customerTagList; /** * 为null则不在黑名单内 */ @ApiModelProperty(value = "黑名单id") private String blackId; public MemberVO(Member member) { BeanUtil.copyProperties(member, this); } 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> 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