java/qijisheng.git

			@@ -124,6 +124,7 @@
			AppUserShop appUserShop = new AppUserShop();
			appUserShop.setAppUserId(appUser.getId());
			appUserShop.setShopId(shopId);
			appUserShop.setRoleType(1);
			R<Void> r = appUserClient.addAppUserShop(appUserShop);
			if (R.isError(r)){
			throw new RuntimeException("添加失败");
			@@ -176,7 +177,7 @@
			userShop.setShopId(shopId);
			userShop.setRoleType(1);
			userShop.setRoleId(2L);
			userShop.setNickName(sysUser.getNickName());
			userShop.setNickName(user.getNickName());
			userShop.setCreateTime(LocalDateTime.now());
			userShopClient.saveUserShop(userShop);
			}
			@@ -210,7 +211,14 @@
			}
			Shop shop = shopService.getById(id);
			shop.setDelFlag(1);

			shopService.updateById(shop);
			// 查询有没有门店绑定这个被删除的门店
			List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list();
			for (Shop shop1 : shops) {
			shop1.setPid(0);
			}
			shopService.updateBatchById(shops);
			appUserClient.clearBindShop(shop.getId());
			UserShop userShop = new UserShop();
			userShop.setShopId(shop.getId());
			@@ -284,6 +292,7 @@
			AppUserShop appUserShop = new AppUserShop();
			appUserShop.setAppUserId(appUser.getId());
			appUserShop.setShopId(shop.getId());
			appUserShop.setRoleType(1);
			appUserShopClient.delAppUserShop(appUserShop);

			//添加新管理员
			@@ -291,7 +300,11 @@
			appUserShop = new AppUserShop();
			appUserShop.setAppUserId(appUser.getId());
			appUserShop.setShopId(shop.getId());
			appUserShop.setRoleType(1);
			appUserClient.addAppUserShop(appUserShop);
			appUser.setUserType(2);
			appUserClient.editAppUserById(appUser);


			//修改管理员
			shop.setAppUserId(appUser.getId());
			@@ -666,7 +679,7 @@

			@PostMapping("/saveWithdrawalAccount")
			@ApiOperation(value = "保存提现账户", tags = {"门店后台-财务统计-提现明细"})
			public R saveWithdrawalAccount(SaveWithdrawalAccount saveWithdrawalAccount) {
			public R saveWithdrawalAccount(@RequestBody SaveWithdrawalAccount saveWithdrawalAccount) {
			shopService.saveWithdrawalAccount(saveWithdrawalAccount);
			return R.ok();
			}