springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java
@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.constants.Constants; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.excel.CustomSheetWriteHandler; import com.panzhihua.common.interfaces.ShopOperLog; @@ -75,7 +76,7 @@ return communityService.pageStoreList(pageComShopStoreDTO); } @ApiOperation(value = "保存商家Bak") // @ApiOperation(value = "保存商家Bak") @PostMapping("/store/saveBak") public R saveStoreBak(@Valid @RequestBody ShopStoreVO storeVO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); @@ -134,14 +135,15 @@ return R.ok(); } @ApiOperation(value = "编辑商家、启用、禁用") @PostMapping("/store/edit/{id}") @ApiImplicitParam(name = "id", value = "商家id") public R editStore(@Valid @RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) { // @ApiOperation(value = "编辑商家、启用、禁用") @PostMapping("/storebak/edit/{id}") // @ApiImplicitParam(name = "id", value = "商家id") public R editStoreBak(@Valid @RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) { R<LoginUserInfoVO> sysUserVO = userService.getSysUserVOByAccountAndType(storeVO.getStoreAccount(),5); if (sysUserVO.getData() == null) { return R.fail("没有相关的用户！"); } LoginUserInfoVO user = JSON.parseObject(JSON.toJSONString(sysUserVO.getData())).toJavaObject(LoginUserInfoVO.class); storeVO.setSysUserId(user.getUserId()); R<ShopStoreVO> storeInfoVO = communityService.getStoreInfo(id); @@ -161,6 +163,28 @@ return R.fail(); } @ApiOperation(value = "编辑商家、启用、禁用") @PostMapping("/store/edit/{id}") @ApiImplicitParam(name = "id", value = "商家id") public R editStore(@Valid @RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) { //判断参数 if(storeVO == null || id == null){ return R.fail("参数错误"); } storeVO.setId(id); //修改店铺信息 R editStore = communityService.editStore(storeVO, id); if(editStore == null || editStore.getCode() != Constants.SUCCESS){ return editStore; } //修改SysUser信息 R editUser = userService.editSysUser(storeVO); if(editUser == null || editUser.getCode() != Constants.SUCCESS){ return editUser; } return R.ok(); } @ApiOperation(value = "删除商家") @PostMapping("/store/delete") public R delete(@RequestBody Long[] ids) { springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -653,4 +653,12 @@ */ @PostMapping("addSysUser") R addSysUser(@RequestBody ShopStoreVO storeVO); /** * 修改SysUser信息 * @param storeVO sysUser信息 * @return 修改结果 */ @PostMapping("editSysUser") R editSysUser(@RequestBody ShopStoreVO storeVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
@@ -162,14 +162,16 @@ @Override public R editStore(Long id, ShopStoreVO storeVO) { if (storeVO == null) { return R.ok("500", "数据为空！"); ComShopStoreDO storeDO = this.baseMapper.selectById(id); if(storeDO == null){ return R.fail("商家不存在"); } LambdaQueryWrapper<ComShopStoreDO> query = new LambdaQueryWrapper<ComShopStoreDO>().eq(ComShopStoreDO::getId, id); ComShopStoreDO storeDO = new ComShopStoreDO(); BeanUtils.copyProperties(storeVO, storeDO); int update = this.baseMapper.update(storeDO, query); return update > 0 ? R.ok() : R.fail(); if(this.baseMapper.updateById(storeDO) > 0){ return R.ok(); }else{ return R.fail(); } } @Override springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -747,12 +747,22 @@ } /** * 通过账号和渠道查询用户信息 * @param storeVO * @return * 创建SysUser用户信息以及权限 * @param storeVO 请求参数 * @return 创建结果 */ @PostMapping("addSysUser") public R addSysUser(@RequestBody ShopStoreVO storeVO){ return userService.addSysUser(storeVO); } /** * 修改SysUser用户信息 * @param storeVO 请求参数 * @return 修改结果 */ @PostMapping("editSysUser") public R editSysUser(@RequestBody ShopStoreVO storeVO){ return userService.editSysUser(storeVO); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -371,4 +371,11 @@ * @return 新增结果 */ R addSysUser(ShopStoreVO storeVO); /** * 修改SysUser用户信息 * @param storeVO 请求参数 * @return 修改结果 */ R editSysUser(ShopStoreVO storeVO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1574,6 +1574,12 @@ return R.ok(sysUserVO); } /** * 新增SysUser * @param storeVO 请求参数 * @return 新增结果 */ @Override public R addSysUser(ShopStoreVO storeVO){ SysUserDO sysUserDO = new SysUserDO(); @@ -1611,7 +1617,6 @@ return R.fail("角色不存在"); } String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword()); storeVO.setStorePassword(encode); BeanUtils.copyProperties(storeVO, sysUserDO); sysUserDO.setAccount(storeVO.getStoreAccount()); sysUserDO.setType(5); @@ -1619,6 +1624,7 @@ sysUserDO.setStatus(1); sysUserDO.setPhone(storeVO.getPhone()); sysUserDO.setName(storeVO.getContacts()); sysUserDO.setPassword(encode); int insert = 0; try { insert = userDao.insert(sysUserDO); @@ -1649,4 +1655,24 @@ } return R.fail(); } /** * 修改SysUser用户信息 * @param storeVO 请求参数 * @return 修改结果 */ @Override public R editSysUser(ShopStoreVO storeVO){ SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,storeVO.getPhone()) .eq(SysUserDO::getType,5)); if(sysUserDO1 == null){ return R.fail("未查询到后台管理用户！"); } String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword()); sysUserDO1.setPassword(encode); if (userDao.updateById(sysUserDO1) > 0) { return R.ok(); } return R.fail("密码修改失败"); } }
