平台管理端 ---会员中心

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

@@ -11,6 +11,7 @@ import com.slodon.b2b2c.core.response.PageVO;
 import com.slodon.b2b2c.core.response.PagerInfo;
 import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.core.util.*;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.member.dto.MemberAddDTO;
 import com.slodon.b2b2c.member.dto.MemberIntegralLogUpdateDTO;
 import com.slodon.b2b2c.member.dto.MemberUpdateDTO;
@@ -21,11 +22,14 @@ import com.slodon.b2b2c.model.member.MemberIntegralLogModel;
 import com.slodon.b2b2c.model.member.MemberModel;
 import com.slodon.b2b2c.model.msg.MemberSettingModel;
 import com.slodon.b2b2c.model.seller.StoreApplyModel;
+import com.slodon.b2b2c.model.seller.StoreNameModel;
 import com.slodon.b2b2c.model.seller.VendorModel;
 import com.slodon.b2b2c.model.seller.VendorRolesModel;
 import com.slodon.b2b2c.seller.example.StoreApplyExample;
+import com.slodon.b2b2c.seller.example.StoreNameExample;
 import com.slodon.b2b2c.seller.example.VendorExample;
 import com.slodon.b2b2c.seller.pojo.StoreApply;
+import com.slodon.b2b2c.seller.pojo.StoreName;
 import com.slodon.b2b2c.seller.pojo.Vendor;
 import com.slodon.b2b2c.seller.pojo.VendorRoles;
 import com.slodon.b2b2c.system.pojo.Admin;
@@ -65,6 +69,8 @@ public class VendorController extends BaseController {
     private RedisTemplate<String, Object> objectRedisTemplate;
     @Resource
     private StoreApplyModel storeApplyModel;
+    @Resource
+    private StoreNameModel storeNameModel;
 
     /**
      * 商家列表
@@ -78,6 +84,7 @@ public class VendorController extends BaseController {
      */
     @ApiOperation("商家列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "memberName", value = "会员名称", paramType = "query"),
             @ApiImplicitParam(name = "memberMobile", value = "mobile", paramType = "query"),
             @ApiImplicitParam(name = "state", value = "会员状态：0-禁用，1-启用", paramType = "query"),
@@ -88,6 +95,7 @@ public class VendorController extends BaseController {
     })
     @GetMapping("list")
     public JsonResult<PageVO<StoreVendorVO>> getList(HttpServletRequest request,
+                                                     @RequestParam(value = "webSite", required = false) String webSite,
                                                      @RequestParam(value = "vendorName", required = false) String vendorName,
                                                      @RequestParam(value = "vendorMobile", required = false) String vendorMobile,
                                                      @RequestParam(value = "state", required = false) Integer state,
@@ -115,6 +123,15 @@ public class VendorController extends BaseController {
                 if (!CollectionUtils.isEmpty(storeApplyList)){
                     storeName = storeApplyList.get(0).getStoreName();
                 }
+                if(WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)){
+                    StoreNameExample storeNameExample = new StoreNameExample();
+                    storeNameExample.setStoreId(vendor.getStoreId());
+                    storeNameExample.setWebSite(webSite);
+                    List<StoreName> storeNameList = storeNameModel.getStoreNameList(storeNameExample, null);
+                    if (!CollectionUtils.isEmpty(storeNameList)){
+                        storeName = storeNameList.get(0).getStoreName();
+                    }
+                }
                 StoreVendorVO vo = new StoreVendorVO(vendor,storeName);
                 //获取权限组名称
 //                VendorRoles vendorRoles = vendorRolesModel.getVendorRolesByRolesId(vendor.getRolesId());

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/seller/advich/SellerEnquiryController.java

@@ -1,5 +1,6 @@
 package com.slodon.b2b2c.controller.member.seller.advich;
 
+import com.slodon.b2b2c.core.constant.VendorConst;
 import com.slodon.b2b2c.core.controller.BaseController;
 import com.slodon.b2b2c.core.response.JsonResult;
 import com.slodon.b2b2c.core.response.PageVO;
@@ -97,6 +98,7 @@ public class SellerEnquiryController extends BaseController {
     public JsonResult<PageVO<EnquiryVendorVO>> getSubAdminList(HttpServletRequest request) {
         Vendor vendorInfo = UserUtil.getUser(request, Vendor.class);
         VendorExample example = new VendorExample();
+        example.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         example.setStoreId(vendorInfo.getStoreId());
         example.setOrderBy("vendor_id asc");
         List<Vendor> vendorList = vendorModel.getVendorList(example, null);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/msg/seller/SellerVerifyController.java

@@ -3,6 +3,7 @@ package com.slodon.b2b2c.controller.msg.seller;
 import cn.hutool.extra.mail.MailUtil;
 import com.slodon.b2b2c.core.config.DomainUrlUtil;
 import com.slodon.b2b2c.core.constant.SMSConst;
+import com.slodon.b2b2c.core.constant.VendorConst;
 import com.slodon.b2b2c.core.controller.BaseController;
 import com.slodon.b2b2c.core.exception.MallException;
 import com.slodon.b2b2c.core.random.RandomUtil;
@@ -77,6 +78,7 @@ public class SellerVerifyController extends BaseController {
 
         VendorExample example = new VendorExample();
         example.setVendorMobile(mobile);
+        example.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> vendorList = vendorModel.getVendorList(example, null);
 
         // 阿里云发送

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/seller/SellerRolesController.java

@@ -188,6 +188,7 @@ public class SellerRolesController extends BaseController {
         //角色是否绑定账号，如果绑定则不能删除
         VendorExample vendorExample = new VendorExample();
         vendorExample.setRolesId(rolesId);
+        vendorExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> vendorList = vendorModel.getVendorList(vendorExample, null);
         AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "该权限组绑定了账号，不能删除");
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/seller/SellerVendorController.java

@@ -243,17 +243,20 @@ public class SellerVendorController extends BaseController {
         //根据手机号查询数据库
         VendorExample vendorExample = new VendorExample();
         vendorExample.setVendorMobile(mobile);
+        vendorExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> vendorList = vendorModel.getVendorList(vendorExample, null);
         AssertUtil.isTrue(CollectionUtils.isEmpty(vendorList), "对不起，该手机号未注册");
 
         VendorExample vendorNameExample = new VendorExample();
         vendorNameExample.setVendorName(vendorName);
+        vendorExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> vendorNameList = vendorModel.getVendorList(vendorNameExample, null);
         AssertUtil.isTrue(CollectionUtils.isEmpty(vendorNameList), "对不起，该商家账户未注册");
 
         VendorExample allVendorExample = new VendorExample();
         allVendorExample.setVendorMobile(mobile);
         allVendorExample.setVendorName(vendorName);
+        vendorExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> allVendorList = vendorModel.getVendorList(allVendorExample, null);
         AssertUtil.isTrue(CollectionUtils.isEmpty(allVendorList), "对不起，该商家账户和手机号不匹配");
 
@@ -335,6 +338,7 @@ public class SellerVendorController extends BaseController {
         //查询该手机号是否已注册过
         VendorExample example = new VendorExample();
         example.setVendorMobile(vendorRegisterDTO.getVendorMobile());
+        example.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> vendorList = vendorModel.getVendorList(example, null);
 
         AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "此手机号已绑定商家账号");

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/sso/seller/SellerAuthController.java

@@ -95,6 +95,7 @@ public class SellerAuthController {
             // 登录验证
             VendorExample vendorExample = new VendorExample();
             vendorExample.setVendorName(username);
+            vendorExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
             List<Vendor> vendorList = vendorModel.getVendorList(vendorExample, null);
             if (CollectionUtils.isEmpty(vendorList)) {
                 // 检测gp系统用户是否存在

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

@@ -91,10 +91,11 @@ public class MemberModel {
         List<Member> list = memberReadMapper.listByExample(example);
         AssertUtil.isTrue(!CollectionUtils.isEmpty(list), "会员名称重复,请重新填写");
 
-//        example.setMemberName(null);
-//        example.setMemberMobile(memberAddDTO.getMemberMobile());
-//        List<Member> mobileList = memberReadMapper.listByExample(example);
-//        AssertUtil.isTrue(!CollectionUtils.isEmpty(mobileList), "该手机号已经绑定会员");
+        example.setMemberName(null);
+        example.setWebSite(memberAddDTO.getWebSite());
+        example.setMemberMobile(memberAddDTO.getMemberMobile());
+        List<Member> mobileList = memberReadMapper.listByExample(example);
+        AssertUtil.isTrue(!CollectionUtils.isEmpty(mobileList), "该手机号已经绑定会员");
 
         //新增
         Member insertOne = new Member();