java/qijisheng.git

			@@ -270,7 +270,7 @@
			if (!shopService.cheUserByPhone(phone)) {
			return R.fail("该手机号未注册");
			}
			if (shop.getPid()!=null){
			if (shop.getPid() != null && shop.getPid() != 0){
			Shop shopP = shopService.getById(shop.getPid());
			if (shopP.getPid()!=null&&shopP.getPid()!=0&& shopP.getPid().equals(shop.getId())){
			return R.fail("门店之间不能互相作为上级门店");
			@@ -328,6 +328,8 @@
			userShop.setShopId(shop.getId());
			userShop.setRoleType(1);
			userShop.setRoleId(2L);
			userShop.setNickName(sysUser.getNickName());
			userShop.setCreateTime(LocalDateTime.now());
			userShopClient.saveUserShop(userShop);
			}
			}else{
			@@ -352,6 +354,8 @@
			userShop.setShopId(shop.getId());
			userShop.setRoleType(1);
			userShop.setRoleId(2L);
			userShop.setNickName(appUser.getName());
			userShop.setCreateTime(LocalDateTime.now());
			userShopClient.saveUserShop(userShop);
			}
			return R.ok();