权星修复相关接口

mall-admin/src/main/java/com/macro/mall/controller/member/UmsMemberController.java

@@ -25,7 +25,7 @@ import java.util.List;
  * Created by macro on 2018/8/3.
  */
 @Controller
-@Api(tags = "会员实名认证管理", description = "会员实名认证管理")
+@Api(tags = "权星后台_会员相关接口", description = "权星后台_会员相关接口")
 @RequestMapping("/member")
 public class UmsMemberController {
 
@@ -34,76 +34,6 @@ public class UmsMemberController {
     @Resource
     private UmsMemberTagService memberTagService;
 
-    @ApiOperation("实名认证审核列表")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    @ResponseBody
-    public CommonResult<CommonPage<UmsMember>> list(@RequestParam(value = "status") String status,
-                                                    @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
-                                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
-        List<UmsMember> list = memberService.reviewList(status, pageSize, pageNum);
-        return CommonResult.success(CommonPage.restPage(list));
-    }
-
-    @ApiOperation(value = "提交审核")
-    @RequestMapping(value = "/submit", method = RequestMethod.POST)
-    @ResponseBody
-    public CommonResult submit(@RequestBody UmsMemberReview memberReview) {
-        return memberService.submit(memberReview);
-    }
-
-    @ApiOperation("查询会员审核信息")
-    @RequestMapping(value = "/selectById", method = RequestMethod.GET)
-    @ResponseBody
-    public CommonResult<UmsMemberVo> selectById(@RequestParam(value = "id") Long id) {
-        UmsMemberVo member = memberService.getUmsMemberVoById(id);
-        return CommonResult.success(member);
-    }
-
-    @ApiOperation("会员列表")
-    @RequestMapping(value = "/memberList", method = RequestMethod.GET)
-    @ResponseBody
-    public CommonResult<CommonPage<UmsMemberVo>> getMemberList(@ModelAttribute UmsMemberParam umsMemberParam,
-                                                               @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
-                                                               @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
-        List<UmsMemberVo> memberList = memberService.getMemberList(umsMemberParam, pageSize, pageNum);
-
-        return CommonResult.success(CommonPage.restPage(memberList));
-    }
-
-    @ApiOperation("账户禁用/解封")
-    @RequestMapping(value = "/setAccount", method = RequestMethod.PUT)
-    @ResponseBody
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "memberId", value = "会员id", required = true, dataType = "long", paramType = "query"),
-            @ApiImplicitParam(name = "flag", value = "操作类型（1禁用2解封）", required = true, dataType = "int", paramType = "query")
-    })
-    public CommonResult setAccount(@RequestParam Long memberId, Integer flag) {
-
-        Integer count = memberService.setAccount(memberId, flag);
-        if (count > 0) {
-            return CommonResult.success(count);
-        } else {
-            return CommonResult.failed();
-        }
-
-    }
-
-    @ApiOperation("会员标签")
-    @GetMapping(value = "/member/tags/{memberId}")
-    @ResponseBody
-    public CommonResult<CommonPage<UmsMemberTagVo>> getMemberTags(@PathVariable Long memberId) {
-        List<UmsMemberTagVo> tags = memberTagService.getMemberTagsByMemberId(memberId);
-        return CommonResult.success(CommonPage.restPage(tags));
-    }
-
-    @ApiOperation("会员标签更改")
-    @PutMapping(value = "member/tags")
-    @ResponseBody
-    public CommonResult updateMemberTags(@RequestBody UmsMemberTagParam param) {
-        memberTagService.updateMemberTags(param);
-        return CommonResult.success("更改成功");
-    }
-
     @ApiOperation("权星后台_插入会员")
     @RequestMapping(value = "/insertMember", method = RequestMethod.POST)
     @ResponseBody
@@ -130,4 +60,29 @@ public class UmsMemberController {
     return CommonResult.success(this.memberService.getMemberListByAccountType(accouuntType));
     }
 
+    @ApiOperation("权星后台_查询会员分页数据")
+    @ResponseBody
+    @RequestMapping(value = "/getPageList", method = RequestMethod.GET)
+    public CommonResult<CommonPage<UmsMember>> getPageList(@ApiParam("页数") @RequestParam("pageNum")Integer pageNum, @ApiParam("每页大小")@RequestParam("pageSize")Integer pageSize,
+                                                           @ApiParam("不传则查询所有角色 账户类型（0管理员1供应商2分销商）") @RequestParam("accouuntType")Integer accouuntType){
+        return  CommonResult.success(CommonPage.restPage(this.memberService.getPageList(pageNum,pageSize,accouuntType)));
+    }
+
+    @ApiOperation("权星后台_根据会员id查询一条会员数据")
+    @RequestMapping(value = "/selectOneById", method = RequestMethod.POST)
+    @ResponseBody
+    public CommonResult selectOneById(@ApiParam("id") @RequestParam("id")Long id){
+        return CommonResult.success(this.memberService.selectOneById(id));
+    }
+
+    @ApiOperation("权星后台_根据会员id修改一条会员数据")
+    @RequestMapping(value = "/updateOneById", method = RequestMethod.POST)
+    @ResponseBody
+    public CommonResult updateOneById(@ApiParam("会员对象,传入Id,以及对应的要修改的值.例如帐号启用状态:0->禁用；1->启用  禁用账号在对应的字段传入0") @RequestBody UmsMember umsMember){
+            ResultMsg res = this.memberService.updateOtherById(umsMember);
+            if(res.isFlag()){
+                return  CommonResult.success(null,res.getMsg());
+            }
+            return  CommonResult.failed(res.getMsg());
+    }
 }

mall-service/src/main/java/com/macro/mall/service/member/UmsMemberService.java

@@ -180,4 +180,26 @@ public interface UmsMemberService {
      * @return
      */
     List<UmsMember> getMemberListByAccountType(Integer accouuntType);
+
+    /**
+     * 分页查询会员信息
+     * @param pageNum
+     * @param pageSize
+     * @param accouuntType
+     * @return
+     */
+    List<UmsMember> getPageList(Integer pageNum,Integer pageSize,Integer accouuntType);
+
+    /**
+     * 根据id查询一条会员信息
+     * @return
+     */
+    UmsMember selectOneById(Long id);
+
+    /**
+     * 根据id修改其他参数
+     * @param umsMember
+     * @return
+     */
+    ResultMsg updateOtherById(UmsMember umsMember);
 }

mall-service/src/main/java/com/macro/mall/service/member/impl/UmsMemberServiceImpl.java

@@ -745,4 +745,51 @@ public class UmsMemberServiceImpl implements UmsMemberService {
         criteria.andAccouuntTypeEqualTo(accouuntType);
         return this.umsMemberMapper.selectByExample(example);
     }
+
+
+    /**
+     * 分页查询会员信息
+     * @param pageNum
+     * @param pageSize
+     * @param accouuntType
+     * @return
+     */
+    @Override
+    public  List<UmsMember> getPageList(Integer pageNum,Integer pageSize,Integer accouuntType){
+        PageHelper.startPage(pageNum, pageSize);
+        UmsMemberExample example = new UmsMemberExample();
+        UmsMemberExample.Criteria criteria = example.createCriteria();
+        if(accouuntType != null){//如果账号类型不为空
+            criteria.andAccouuntTypeEqualTo(accouuntType);
+        }
+        //过滤已删除的数据
+        criteria.andDeleteStatusEqualTo(0);//删除标识0 未删除 1已删除
+        List<UmsMember> umsMemberList = this.umsMemberMapper.selectByExample(example);
+        return umsMemberList;
+    }
+
+    /**
+     * 根据id查询一条会员信息
+     * @return
+     */
+    @Override
+    public UmsMember selectOneById(Long id){
+        return this.umsMemberMapper.selectByPrimaryKey(id);
+    }
+
+    /**
+     * 根据id修改其他参数
+     * @param umsMember
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResultMsg updateOtherById(UmsMember umsMember){
+        if(umsMember.getId() == null){
+            return new ResultMsg(false,"传入id为空");
+        }
+        this.umsMemberMapper.updateByPrimaryKeySelective(umsMember);
+        return new ResultMsg(true,"操作成功");
+    }
+
 }