From cb490e56ee7bccbc3b56d6964e9b68e5aa8ec475 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 17:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 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 416d645..ecb2180 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
@@ -41,7 +41,7 @@
*/
@RestController
@RequestMapping("/shop")
-@Api(tags = "门店")
+@Api("门店")
public class ShopController extends BaseController {
@Resource
private ShopService shopService;
@@ -56,9 +56,13 @@
@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 +80,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 +93,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 +124,9 @@
* 通过手机号校验店长
*/
@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("未查询到用户");
- }
- return R.ok();
+ @ApiOperation(value = "通过手机号校验店长", tags = {"管理后台-门店管理"})
+ public R<Boolean> cheUserByPhone(@RequestParam("phone") String phone) {
+ return R.ok(shopService.cheUserByPhone(phone));
}
@@ -206,6 +203,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