From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java
index 5a5b73e..c0fe645 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java
@@ -46,7 +46,7 @@
* 查询指定门店手机号
*/
@GetMapping("/selectPhoneByShopId")
- @ApiOperation(value = "查询指定门店手机号", tags = {"小程序-门店详情-查询客服电话"})
+ @ApiOperation(value = "查询指定门店手机号", tags = {"小程序-首页-门店详情"})
public R<List<Phone>> getPhoneByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {
return R.ok(phoneService.list(new LambdaQueryWrapper<Phone>()
.eq(Phone::getType, PhoneType.SHOP.getCode())
@@ -58,8 +58,8 @@
@GetMapping("/getSysPhone")
@ApiOperation(value = "获取客服电话", tags = {"管理后台-客服电话", "门店后台-客服电话"})
public R<Phone> getSysPhone(){
- Long userid = tokenService.getLoginUser().getUserid();
- SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ Long userId = tokenService.getLoginUser().getSysUser().getUserId();
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
LambdaQueryWrapper<Phone> wrapper = new LambdaQueryWrapper<>();
if(sysUser.getRoleType() == 1){
wrapper.eq(Phone::getType, 1);
@@ -75,8 +75,8 @@
@PostMapping("/savePhone")
@ApiOperation(value = "保存客服电话", tags = {"管理后台-客服电话", "门店后台-客服电话"})
public R savePhone(@RequestBody Phone phone){
- Long userid = tokenService.getLoginUser().getUserid();
- SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ Long userId = tokenService.getLoginUser().getSysUser().getUserId();
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
//平台配置
if(sysUser.getRoleType() == 1){
Phone one = phoneService.getOne(new LambdaQueryWrapper<Phone>().eq(Phone::getType, 1));
--
Gitblit v1.7.1