springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java
@@ -13,6 +13,7 @@ import com.panzhihua.common.model.dtos.shop.*; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngVolunteerMngAppletsVO; import com.panzhihua.common.model.vos.shop.*; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.model.vos.user.ChangePasswordVO; @@ -77,11 +78,17 @@ @ApiOperation(value = "保存商家") @PostMapping("/store/save") public R saveStore(@Valid @RequestBody ShopStoreVO storeVO) { //查询商家电话号码唯一性 R storeVOr = communityService.getStoreByPhone(storeVO.getPhone()); ShopStoreVO storeVOByPhone = null; if(R.isOk(storeVOr)){ storeVOByPhone = JSON.parseObject(JSON.toJSONString(storeVOr.getData()), ShopStoreVO.class); } if(storeVOByPhone!=null){ return R.fail("商家电话号已存在！"); } LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long loginUserId = loginUserInfo.getUserId(); if (storeVO == null) { return R.fail(); } R<SysUserVO> sysUserVO = userService.getSysUserVOByAccountAndType(storeVO.getStoreAccount(),5); JSONObject jsonObject = null; if (sysUserVO.getData() != null) { springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1788,6 +1788,13 @@ /** * 根据电话号获取店铺 * @param phone 电话号 */ @GetMapping("/shop/getStoreByPhone") R getStoreByPhone(@RequestParam("phone") String phone); /** * 编辑店铺、启用、禁用 * @param storeVO 数据 * @param id 商铺id springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -2,7 +2,6 @@ import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.dtos.shop.*; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; @@ -20,9 +19,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Date; import java.util.List; import javax.validation.constraints.NotNull; @Slf4j @RestController @@ -75,6 +72,11 @@ return comShopStoreService.editStore(id, storeVO); } @GetMapping("/getStoreByPhone") R GetStoreByPhone(@RequestParam("phone") String phone){ return comShopStoreService.getStoreByPhone(phone); } /** * 删除店铺 * springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopStoreService.java
@@ -64,4 +64,11 @@ * @return */ R getUserStoreInfo(Long userId); /** * 获取店铺——根据电话号 * @param phone * @return */ R getStoreByPhone(String phone); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
@@ -10,8 +10,8 @@ import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.service_community.dao.ComShopGoodsAttrDAO; import com.panzhihua.service_community.dao.ComShopGoodsDAO; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.service_community.dao.ComShopStoreDAO; import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO; import com.panzhihua.service_community.model.dos.ComShopStoreDO; import com.panzhihua.service_community.service.ComShopStoreService; import lombok.extern.slf4j.Slf4j; @@ -89,12 +89,12 @@ @Override public R saveStore(ShopStoreVO storeVO) { if (storeVO == null) { return R.ok("500", "数据为空！"); return R.fail("500", "数据为空！"); } ComShopStoreDO comShopStoreDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopStoreDO>() .eq(ComShopStoreDO::getStoreAccount, storeVO.getStoreAccount())); if (comShopStoreDO != null) { return R.ok("500", "商家账号存在"); return R.fail("500", "商家账号存在"); } ComShopStoreDO storeDO = new ComShopStoreDO(); BeanUtils.copyProperties(storeVO, storeDO); @@ -106,7 +106,7 @@ @Override public R editStore(Long id, ShopStoreVO storeVO) { if (storeVO == null) { return R.ok("500", "数据为空！"); return R.fail("500", "数据为空！"); } LambdaQueryWrapper<ComShopStoreDO> query = new LambdaQueryWrapper<ComShopStoreDO>().eq(ComShopStoreDO::getId, id); ComShopStoreDO storeDO = new ComShopStoreDO(); @@ -147,4 +147,15 @@ BeanUtils.copyProperties(comShopStoreDO, shopStoreVO); return R.ok(shopStoreVO); } @Override public R getStoreByPhone(String phone) { LambdaQueryWrapper<ComShopStoreDO> query = new LambdaQueryWrapper<ComShopStoreDO>(); query.eq(ComShopStoreDO::getPhone, phone); query.eq(ComShopStoreDO::getDeleteStatus, 1); ComShopStoreDO comShopStoreDO = this.baseMapper.selectOne(query); ShopStoreVO shopStoreVO = new ShopStoreVO(); BeanUtils.copyProperties(comShopStoreDO, shopStoreVO); return R.ok(shopStoreVO); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -752,8 +752,8 @@ sysRoleDO.setRoleKey("chaojiguanliyuan" + communityId); }else{ sysRoleDO.setCommunityId(0L); sysRoleDO.setRoleName(administratorsUserVO.getShopStoreName()); sysRoleDO.setRoleKey("shanghupingtai" + administratorsUserVO.getShopStorePhone()); sysRoleDO.setRoleName("商城管理员"); sysRoleDO.setRoleKey("shanghupingtai" + administratorsUserVO.getAccount()); } sysRoleDO.setRoleSort(0); sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
