irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hucs
2024-06-05 18:31:24 +08:00
parent 1846b7b122
commit 5e538a1b1e
5 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java
View File

@@ -1,5 +1,6 @@
package com.starry.admin.modules.clerk.controller;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
import com.starry.admin.modules.clerk.module.entity.PlayClerkUserQueryVo;
@@ -8,6 +9,8 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkUserEditVo;
import com.starry.admin.modules.clerk.module.vo.PlayClerkUserStateEditVo;
import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService;
import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
import com.starry.admin.modules.play.service.IPlayUserInfoService;
import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoQueryVo;
import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoResultVo;
@@ -19,6 +22,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* 店员Controller
@@ -33,6 +37,8 @@ public class PlayClerkUserInfoController {
@Resource
private IPlayUserInfoService playUserInfoService;
@Resource
private IPlayCustomUserInfoService customUserInfoService;
@Resource
private IPlayClerkUserInfoService playClerkUserInfoService;
@Resource
@@ -47,6 +53,13 @@ public class PlayClerkUserInfoController {
return R.ok(list);
}
@GetMapping("/simple/list")
public R simpleList() {
List<PlayClerkUserInfoEntity> clerkList = playClerkUserInfoService.simpleList();
List<PlayCustomUserInfoEntity> customerList = customUserInfoService.simpleList();
return R.ok(new JSONObject().fluentPut("clerkList", clerkList).fluentPut("customerList", customerList));
}
/**
* 查询店员列表

2
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserInfoService.java
View File

@@ -174,4 +174,6 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
* @return 结果
*/
int deletePlayClerkUserInfoById(String id);
List<PlayClerkUserInfoEntity> simpleList();
}

7
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
View File

@@ -3,6 +3,7 @@ package com.starry.admin.modules.clerk.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -379,4 +380,10 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
public int deletePlayClerkUserInfoById(String id) {
return playClerkUserInfoMapper.deleteById(id);
}
@Override
public List<PlayClerkUserInfoEntity> simpleList() {
LambdaQueryWrapper<PlayClerkUserInfoEntity> wrapper = Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getDeleted, 0).select(PlayClerkUserInfoEntity::getId, PlayClerkUserInfoEntity::getNickname, PlayClerkUserInfoEntity::getAvatar).orderByDesc(PlayClerkUserInfoEntity::getId);
return this.list(wrapper);
}
}

3
play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomUserInfoService.java
View File

@@ -9,6 +9,7 @@ import com.starry.admin.modules.custom.module.vo.PlayCustomUserQueryVo;
import com.starry.admin.modules.custom.module.vo.PlayCustomUserReturnVo;
import java.math.BigDecimal;
import java.util.List;
/**
* 顾客Service接口
@@ -117,4 +118,6 @@ public interface IPlayCustomUserInfoService extends IService<PlayCustomUserInfoE
* @return 结果
*/
int deletePlayCustomUserInfoById(String id);
List<PlayCustomUserInfoEntity> simpleList();
}

8
play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomUserInfoServiceImpl.java
View File

@@ -3,6 +3,7 @@ package com.starry.admin.modules.custom.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -275,4 +276,11 @@ public class PlayCustomUserInfoServiceImpl extends ServiceImpl<PlayCustomUserInf
public int deletePlayCustomUserInfoById(String id) {
return playCustomUserInfoMapper.deleteById(id);
}
@Override
public List<PlayCustomUserInfoEntity> simpleList() {
LambdaQueryWrapper<PlayCustomUserInfoEntity> wrapper = Wrappers.lambdaQuery(PlayCustomUserInfoEntity.class);
wrapper.orderByDesc(PlayCustomUserInfoEntity::getId).eq(PlayCustomUserInfoEntity::getDeleted, 0).select(PlayCustomUserInfoEntity::getAvatar, PlayCustomUserInfoEntity::getId, PlayCustomUserInfoEntity::getNickname, PlayCustomUserInfoEntity::getAvatar);
return baseMapper.selectList(wrapper);
}
}