java/qijisheng.git

			@@ -114,6 +114,9 @@
			shop.setCustomOrderNumber(0);
			shop.setAppUserId(appUser.getId());
			String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
			if(!StringUtils.hasLength(city)){
			city = "510100";
			}
			shop.setProvinceCode(city.substring(0, 2) + "0000");
			shop.setCityCode(city.substring(0, 4) + "00");
			shop.setDistrictCode(city);
			@@ -124,6 +127,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 +180,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);
			}
			@@ -215,9 +219,10 @@
			// 查询有没有门店绑定这个被删除的门店
			List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list();
			for (Shop shop1 : shops) {
			shop1.setPid(0);
			LambdaUpdateWrapper<Shop> set = new LambdaUpdateWrapper<Shop>().set(Shop::getPid, null)
			.eq(Shop::getId,shop1.getId());
			shopService.update(set);
			}
			shopService.updateBatchById(shops);
			appUserClient.clearBindShop(shop.getId());
			UserShop userShop = new UserShop();
			userShop.setShopId(shop.getId());
			@@ -291,6 +296,7 @@
			AppUserShop appUserShop = new AppUserShop();
			appUserShop.setAppUserId(appUser.getId());
			appUserShop.setShopId(shop.getId());
			appUserShop.setRoleType(1);
			appUserShopClient.delAppUserShop(appUserShop);

			//添加新管理员
			@@ -298,7 +304,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());
			@@ -673,7 +683,7 @@

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