From d53c16a12e612a95dc8f6fb248e3669cbc441eb4 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期二, 17 十二月 2024 16:48:41 +0800 Subject: [PATCH] 新增加商品特价接口 --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 68 +++++++++++++++++++++++++++------- 1 files changed, 54 insertions(+), 14 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java index fda8ee6..607cb6c 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java @@ -16,6 +16,8 @@ import com.ruoyi.other.service.ShopService; import com.ruoyi.other.vo.NearbyShopVO; import com.ruoyi.other.vo.ShopDetailVO; +import com.ruoyi.system.api.domain.SysUser; +import com.ruoyi.system.api.feignClient.SysUserClient; import com.ruoyi.system.api.model.LoginUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -51,14 +53,20 @@ private ShopScoreService shopScoreService; @Resource private TokenService tokenService; + @Resource + private SysUserClient sysUserClient; @PostMapping - @ApiOperation(value = "新增门店", tags = {"后台管理-门店管理"}) + @ApiOperation(value = "新增门店", tags = {"管理后台-门店管理"}) @Transactional(rollbackFor = Exception.class) public R<Void> add(@RequestBody Shop shop){ + String phone = shop.getPhone(); + if (!shopService.cheUserByPhone(phone)) { + return R.fail("该手机号未注册"); + } shop.setShopAllPoint(0); shop.setShopPoint(0); shop.setSharePoint(0); @@ -76,7 +84,7 @@ shop.setCustomOrderNumber(0); shopService.save(shop); - LoginUser loginUserApplet = tokenService.getLoginUserApplet(); + LoginUser loginUserApplet = tokenService.getLoginUser(); AppUserShop appUserShop = new AppUserShop(); appUserShop.setAppUserId(loginUserApplet.getUserid()); appUserShop.setShopId(shop.getId()); @@ -89,28 +97,28 @@ @GetMapping("/getDetailById") - @ApiOperation(value = "门店详情", tags = {"后台管理-门店管理"}) + @ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"}) public R<Shop> getDetailById(@RequestParam("id") Long id){ Shop byId = shopService.getById(id); return R.ok(byId); } @DeleteMapping("/deleteShop") - @ApiOperation(value = "删除门店", tags = {"后台管理-门店管理"}) + @ApiOperation(value = "删除门店", tags = {"管理后台-门店管理"}) public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){ shopService.removeById(id); return R.ok(); } @PutMapping("/editShop") - @ApiOperation(value = "编辑门店", tags = {"后台管理-门店管理"}) + @ApiOperation(value = "门店管理-编辑门店", tags = {"管理后台-门店管理"}) public R<Void> editShop(@RequestBody Shop shop){ shopService.updateById(shop); return R.ok(); } @GetMapping("/list") - @ApiOperation(value = "门店列表", tags = {"后台管理-门店管理"}) + @ApiOperation(value = "门店列表", tags = {"管理后台-门店管理"}) public R<IPage<Shop>> list(@ApiParam("页码") @RequestParam Integer pageNum,@ApiParam("每一页数据大小") Integer pageSize,Shop shop){ IPage<Shop> shopIPage = shopService.getShopList(pageNum, pageSize, shop); return R.ok(shopIPage); @@ -120,16 +128,41 @@ * 通过手机号校验店长 */ @PostMapping("/cheUserByPhone") - @ApiOperation(value = "通过手机号校验店长", tags = {"后台管理-门店管理"}) - public R<Void> cheUserByPhone(@RequestParam("phone") String phone) { - R<AppUser> r = appUserClient.getAppUserByPhone(phone); - if (R.isError(r)){ - return R.fail("检验失败"); - } - if (r.getData() == null){ - return R.fail("未查询到用户"); + @ApiOperation(value = "通过手机号校验店长", tags = {"管理后台-门店管理"}) + public R<Boolean> cheUserByPhone(@RequestParam("phone") String phone) { + return R.ok(shopService.cheUserByPhone(phone)); + } + + /** + * 重置密码 + */ + @GetMapping ("/resetPassword") + @ApiOperation(value = "重置密码", tags = {"管理后台-门店管理"}) + public R<Void> resetPassword(@RequestParam(value = "ids") String ids) { + String[] idsArr = ids.split(","); + for (String id : idsArr) { + Shop shop = shopService.getById(Integer.valueOf(id)); + R<SysUser> sysUser = sysUserClient.getSysUser(shop.getAppUserId()); + SysUser userData = sysUser.getData(); + userData.setPassword(getLastSixDigits(userData.getPhonenumber())); + sysUserClient.resetPassword(userData); } return R.ok(); + } + + /** + * 获取手机号的后六位。 + * + * @param phoneNumber 以字符串形式提供的手机号 + * @return 手机号的后六位 + * @throws IllegalArgumentException 如果手机号长度不足六位 + */ + public String getLastSixDigits(String phoneNumber) { + if (phoneNumber == null || phoneNumber.length() < 6) { + throw new IllegalArgumentException("手机号长度不足六位"); + } + // 取字符串的最后六位 + return phoneNumber.substring(phoneNumber.length() - 6); } @@ -206,6 +239,13 @@ Shop shop = shopService.getById(id); return R.ok(shop); } + + @ResponseBody + @PostMapping("/getShopByUserId") + public R<List<Shop>> getShopByUserId(@RequestParam("id") Integer id){ + List<Shop> list = shopService.lambdaQuery().eq(Shop::getAppUserId, id).list(); + return R.ok(list); + } /** -- Gitblit v1.7.1