会员管理增加分销商用户管理

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/member/dto/MemberAddDTO.java

@@ -32,4 +32,7 @@ public class MemberAddDTO implements Serializable {
     @ApiModelProperty(value = "会员来源：1、pc；2、H5；3、Android；4、IOS ;5 商城管理平台 ; 6 微信商城",required = true)
     private Integer registerChannel;
 
+    @ApiModelProperty("会员类型 1：海外门户 2:国内分销商门户")
+    private String memberType;
+
 }

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/member/dto/MemberUpdateDTO.java

@@ -25,4 +25,7 @@ public class MemberUpdateDTO implements Serializable {
     @ApiModelProperty("真实姓名")
     private String memberTrueName;
 
+    @ApiModelProperty("会员类型 1：海外门户 2:国内分销商门户")
+    private String memberType;
+
 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/admin/MemberController.java

@@ -106,7 +106,8 @@ public class MemberController extends BaseController {
             @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query"),
             @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
-            @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
+            @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query"),
+            @ApiImplicitParam(name = "memberType", value = "会员类型", defaultValue = "1", paramType = "query")
     })
     @GetMapping("list")
     public JsonResult<PageVO<MemberVO>> getList(HttpServletRequest request,
@@ -114,7 +115,8 @@ public class MemberController extends BaseController {
                                                 @RequestParam(value = "memberMobile", required = false) String memberMobile,
                                                 @RequestParam(value = "state", required = false) Integer state,
                                                 @RequestParam(value = "startTime", required = false) Date startTime,
-                                                @RequestParam(value = "endTime", required = false) Date endTime) {
+                                                @RequestParam(value = "endTime", required = false) Date endTime,
+                                                @RequestParam(value = "memberType", required = false,defaultValue = "1") String memberType ) {
         //分页设置
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
 
@@ -126,6 +128,7 @@ public class MemberController extends BaseController {
         example.setStateNotEquals(MemberConst.STATE_2);
         example.setRegisterTimeAfter(startTime);
         example.setRegisterTimeBefore(endTime);
+        example.setMemberType(memberType);
         List<Member> list = memberModel.getMemberList(example, pager);
 
         //响应

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/member/MemberModel.java

@@ -87,6 +87,7 @@ public class MemberModel {
         //查重
         MemberExample example = new MemberExample();
         example.setMemberName(memberAddDTO.getMemberName());
+        example.setMemberType(memberAddDTO.getMemberType());
         List<Member> list = memberReadMapper.listByExample(example);
         AssertUtil.isTrue(!CollectionUtils.isEmpty(list), "会员名称重复,请重新填写");
 
@@ -155,6 +156,7 @@ public class MemberModel {
         MemberExample example = new MemberExample();
         example.setMemberName(memberUpdateDTO.getMemberName());
         example.setMemberIdNotEquals(memberUpdateDTO.getMemberId());
+        example.setMemberType(memberUpdateDTO.getMemberType());
         List<Member> list = memberReadMapper.listByExample(example);
         if (!CollectionUtils.isEmpty(list)) {
             throw new MallException("会员名称重复,请重新填写");

xinkeaboard-server/doc/DDL/member.sql

@@ -0,0 +1,4 @@
+ALTER TABLE member
+ADD COLUMN country VARCHAR(100) NULL COMMENT '国家',
+ADD COLUMN city VARCHAR(100) NULL COMMENT '城市',
+ADD COLUMN member_type TINYINT NOT NULL DEFAULT 1 COMMENT '会员类型 1:海外门户 2:国内分销门户';