java/qijisheng.git

			@@ -71,6 +71,7 @@
			if (!shopService.cheUserByPhone(phone)) {
			return R.fail("该手机号未注册");
			}
			AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
			shop.setShopAllPoint(0);
			shop.setShopPoint(0);
			shop.setSharePoint(0);
			@@ -85,18 +86,15 @@
			shop.setOrderNumber(0);
			shop.setServerOrderNumber(0);
			shop.setCustomOrderNumber(0);
			shop.setAppUserId(appUser.getId());
			shopService.save(shop);

			LoginUser loginUserApplet = tokenService.getLoginUser();

			AppUserShop appUserShop = new AppUserShop();
			appUserShop.setAppUserId(loginUserApplet.getUserid());
			appUserShop.setAppUserId(appUser.getId());
			appUserShop.setShopId(shop.getId());
			R<Void> r = appUserClient.addAppUserShop(appUserShop);
			if (R.isError(r)){
			throw new RuntimeException("添加失败");
			}
			AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
			if (appUser == null){
			throw new RuntimeException("添加失败");
			}
			appUser.setUserType(2);
			@@ -110,7 +108,7 @@

			@GetMapping("/getDetailById")
			@ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
			public R<Shop> getDetailById(@RequestParam("id") Long id){
			public R<Shop> getDetailById(@RequestParam("id") Integer id){
			Shop byId = shopService.getById(id);
			return R.ok(byId);
			}
			@@ -225,7 +223,7 @@
			*/
			@GetMapping("/bindShop")
			@ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
			public R<Void> bindShop(@ApiParam("门店id") @RequestParam Long shopId) {
			public R<Void> bindShop(@ApiParam("门店id") @RequestParam Integer shopId) {
			AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
			appUser.setShopId(shopId);
			return appUserClient.editAppUserById(appUser);
			@@ -301,6 +299,15 @@
			ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopName);
			return R.ok(shopStatistics);
			}



			/**
			* 编辑门店
			* @param shop
			*/
			@PostMapping("/updateShop")
			public void updateShop(@RequestBody Shop shop){
			shopService.updateById(shop);
			}
			}