zyp

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -481,7 +481,7 @@ public class FsUserServiceImpl implements IFsUserService
 
     @Override
     public PageInfo<FsUserPageListVO> selectFsUserPageList(FsUserPageListParam param) {
-        System.out.println("参数：" + Arrays.toString(param.getTagIds()));
+//        System.out.println("参数：" + Arrays.toString(param.getTagIds()));
         CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
         if (companyUser!=null && companyUser.isAdmin()){
             param.setUserId(0L);

fs-user-app/src/main/java/com/fs/app/controller/WxCompanyUserController.java

@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.util.Date;
 
 @Api("微信小程序相关接口")
@@ -66,7 +67,7 @@ public class WxCompanyUserController extends AppBaseController {
 
     @ApiOperation("小程序-授权登录")
     @PostMapping("/loginByMa")
-    public R login(@Validated @RequestBody LoginMaWxParam param) {
+    public R login(@RequestBody @Valid LoginMaWxParam param) {
         log.info("=====================进入小程序授权登录, 入参: {}", param);
         if (StringUtils.isBlank(param.getCode())) {
             return R.error("code不存在");
@@ -98,15 +99,17 @@ public class WxCompanyUserController extends AppBaseController {
             }
 
             // 特殊（需求设计：需要根据公司是否开启黑名单来设置会员初始化的状态）
-            Company company = null;
-            if(param.getCompanyId() != null){
-                company = companyService.selectCompanyById(param.getCompanyId());
+            Company company = companyService.selectCompanyById(param.getCompanyId());
+            if (company==null || company.getStatus()==0){
+                return R.error("注册失败团队已停用，或不存在！");
             }
 
+
+
             // 根据销售后台设置的  是否需要单独注册会员 来判断是否需要设置销售的值
-            CompanyUser companyUser = null;
-            if(param.getCompanyUserId() != null){
-                companyUser = companyUserService.selectCompanyUserById(param.getCompanyUserId());
+            CompanyUser companyUser = companyUserService.selectCompanyUserById(param.getCompanyUserId());;
+            if(companyUser == null || companyUser.getStatus().equals("1")){
+                return R.error("注册失败客服已停用，或不存在！");
             }
 
             String ip = IpUtil.getRequestIp();
@@ -120,7 +123,6 @@ public class WxCompanyUserController extends AppBaseController {
                     //修改
                     FsUser userMap = new FsUser();
                     userMap.setUserId(user.getUserId());
-//                userMap.setMpOpenId(session.getOpenid());
                     userMap.setMaOpenId(session.getOpenid());
                     userMap.setUnionId(session.getUnionid());
                     userMap.setUpdateTime(new DateTime());
@@ -131,11 +133,10 @@ public class WxCompanyUserController extends AppBaseController {
                     if (user.getCompanyUserId() != null && !param.getCompanyUserId().equals(user.getCompanyUserId())){
                         return R.error(406, "该用户已成为其他销售会员");
                     }
-                    if(companyUser != null &&
-                            (companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
+                    if((companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
                             && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
-                        user.setCompanyId(param.getCompanyId());
-                        user.setCompanyUserId(param.getCompanyUserId());
+                        userMap.setCompanyId(param.getCompanyId());
+                        userMap.setCompanyUserId(param.getCompanyUserId());
                     }
                     userService.updateFsUser(userMap);
                 } else {
@@ -148,8 +149,7 @@ public class WxCompanyUserController extends AppBaseController {
                     user.setUnionId(session.getUnionid());
                     user.setCreateTime(new Date());
                     user.setPhone(phoneNoInfo.getPhoneNumber());
-                    if(companyUser != null &&
-                            (companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
+                    if((companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
                             && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
                         user.setCompanyId(param.getCompanyId());
                         user.setCompanyUserId(param.getCompanyUserId());