fixed 商家小程序会员管理接口

fuint-application/src/main/java/com/fuint/common/param/MemberDetailParam.java

@@ -0,0 +1,19 @@
+package com.fuint.common.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 会员详情请求参数
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Data
+public class MemberDetailParam implements Serializable {
+
+    @ApiModelProperty(value="会员ID", name="memberId")
+    private Integer memberId;
+
+}

fuint-application/src/main/java/com/fuint/common/param/MemberInfoParam.java

@@ -6,6 +6,7 @@ import java.io.Serializable;
 
 /**
  * 会员查询请求参数
+ *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */

fuint-application/src/main/java/com/fuint/common/param/MemberListParam.java

@@ -6,6 +6,7 @@ import java.io.Serializable;
 
 /**
  * 会员列表请求参数
+ *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
@@ -18,6 +19,9 @@ public class MemberListParam extends PageParam implements Serializable {
     @ApiModelProperty(value="手机号", name="mobile")
     private String mobile;
 
+    @ApiModelProperty(value="关键字", name="keyword")
+    private String keyword;
+
     @ApiModelProperty(value="会员名称", name="name")
     private String name;
 

fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java

@@ -205,6 +205,15 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         if (StringUtils.isNotBlank(id)) {
             wrapper.eq(MtUser::getId, id);
         }
+        String keyword = paginationRequest.getSearchParams().get("keyword") == null ? "" : paginationRequest.getSearchParams().get("keyword").toString();
+        if (StringUtils.isNotBlank(keyword)) {
+            wrapper.and(wq -> wq
+                    .eq(MtUser::getMobile, keyword)
+                    .or()
+                    .eq(MtUser::getUserNo, keyword)
+                    .or()
+                    .eq(MtUser::getName, keyword));
+        }
         String mobile = paginationRequest.getSearchParams().get("mobile") == null ? "" : paginationRequest.getSearchParams().get("mobile").toString();
         if (StringUtils.isNotBlank(mobile)) {
             wrapper.like(MtUser::getMobile, mobile);
@@ -782,8 +791,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
      */
     @Override
     public MtUserGrade queryMemberGradeByGradeId(Integer id) {
-        MtUserGrade gradeInfo = mtUserGradeMapper.selectById(id);
-        return gradeInfo;
+        return mtUserGradeMapper.selectById(id);
     }
 
     /**
@@ -824,8 +832,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         if (params == null) {
             params = new HashMap<>();
         }
-        List<MtUserGrade> result = mtUserGradeMapper.selectByMap(params);
-        return result;
+        return mtUserGradeMapper.selectByMap(params);
     }
 
     /**

fuint-application/src/main/java/com/fuint/module/merchantApi/controller/MerchantMemberController.java

@@ -1,10 +1,10 @@
 package com.fuint.module.merchantApi.controller;
 
 import com.fuint.common.Constants;
-import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.dto.UserDto;
 import com.fuint.common.dto.UserInfo;
 import com.fuint.common.enums.StatusEnum;
+import com.fuint.common.param.MemberDetailParam;
 import com.fuint.common.param.MemberListParam;
 import com.fuint.common.service.*;
 import com.fuint.common.util.DateUtil;
@@ -43,11 +43,6 @@ public class MerchantMemberController extends BaseController {
      */
     private MemberService memberService;
 
-    /**
-     * 会员等级服务接口
-     * */
-    private UserGradeService userGradeService;
-
     /**
      * 店铺员工服务接口
      * */
@@ -77,6 +72,7 @@ public class MerchantMemberController extends BaseController {
         String dataType = memberListParam.getDataType();
         Integer page = memberListParam.getPage() == null ? Constants.PAGE_NUMBER : memberListParam.getPage();
         Integer pageSize = memberListParam.getPageSize() == null ? Constants.PAGE_SIZE : memberListParam.getPageSize();
+        String keyword = memberListParam.getKeyword() == null ? "" : memberListParam.getKeyword();
 
         // 今日注册、今日活跃
         if (dataType.equals("todayRegister")) {
@@ -143,6 +139,12 @@ public class MerchantMemberController extends BaseController {
         if (StringUtil.isNotEmpty(memberTime)) {
             params.put("memberTime", memberTime);
         }
+
+        // 搜索关键字
+        if (StringUtil.isNotEmpty(keyword)) {
+            params.put("keyword", keyword);
+        }
+
         paginationRequest.setSearchParams(params);
         PaginationResponse<UserDto> paginationResponse = memberService.queryMemberListByPagination(paginationRequest);
 
@@ -165,31 +167,29 @@ public class MerchantMemberController extends BaseController {
      * 会员详情
      *
      * @param request
-     * @param id 会员ID
      * @return
      */
     @ApiOperation(value = "查询会员详情")
-    @RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/info", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject info(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
+    public ResponseObject info(HttpServletRequest request, @RequestBody MemberDetailParam memberParam) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
-        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
+        UserInfo userInfo = TokenUtil.getUserInfoByToken(token);
+        if (userInfo == null) {
             return getFailureResult(1001, "请先登录");
         }
 
-        MtUser mtUserInfo = memberService.queryMemberById(id);
-
-        Map<String, Object> param = new HashMap<>();
-        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
-            param.put("MERCHANT_ID", accountInfo.getMerchantId());
+        MtStaff staffInfo = null;
+        MtUser mtUser = memberService.queryMemberById(userInfo.getId());
+        if (mtUser != null && mtUser.getMobile() != null) {
+            staffInfo = staffService.queryStaffByMobile(mtUser.getMobile());
         }
-        param.put("STATUS", StatusEnum.ENABLED.getKey());
-        List<MtUserGrade> userGradeList = memberService.queryMemberGradeByParams(param);
-
+        if (staffInfo == null) {
+            return getFailureResult(201, "该账号不是商户");
+        }
+        MtUser memberInfo = memberService.queryMemberById(memberParam.getMemberId());
         Map<String, Object> result = new HashMap<>();
-        result.put("userGradeList", userGradeList);
-        result.put("memberInfo", mtUserInfo);
+        result.put("memberInfo", memberInfo);
 
         return getSuccessResult(result);
     }