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:
huchuansai
2025-09-01 10:03:13 +08:00
parent fcf8b2d4e8 717d5a0c41
commit a78ddd0ece
624 changed files with 74207 additions and 6595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayAvatarFrameInfoController.java
View File

@@ -13,18 +13,16 @@ import com.starry.common.result.R;
import com.starry.common.utils.ConvertUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import java.io.IOException;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
/**
* 店员头像框Controller
*
@@ -38,17 +36,15 @@ public class PlayAvatarFrameInfoController {
@Resource
private IPlayAvatarFrameInfoService playAvatarFrameInfoService;
@Resource
private IOssFileService ossFileService;
@ApiOperation(value = "分页查询头像框", notes = "分页查询店员头像框信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayAvatarFrameInfoEntity.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayAvatarFrameInfoEntity.class, responseContainer = "Page")})
@PostMapping("/listByPage")
public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayAvatarFrameInfoQueryVo vo) {
public R listByPage(
@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayAvatarFrameInfoQueryVo vo) {
return R.ok(playAvatarFrameInfoService.selectByPage(vo));
}
@@ -57,37 +53,32 @@ public class PlayAvatarFrameInfoController {
*/
@ApiOperation(value = "查询所有头像框", notes = "获取所有店员头像框信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayAvatarFrameInfoEntity.class, responseContainer = "List")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayAvatarFrameInfoEntity.class, responseContainer = "List")})
@GetMapping("/listAll")
public R listAll() {
return R.ok(playAvatarFrameInfoService.selectAll());
}
@ApiOperation(value = "上传头像框图片", notes = "上传店员头像框图片文件")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = String.class, responseContainer = "R")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = String.class, responseContainer = "R")})
@PostMapping("/uploadFile")
public R uploadFile(@ApiParam(value = "图片文件", required = true) @RequestParam("file") MultipartFile file) throws IOException {
String fileAddress = ossFileService.upload(file.getInputStream(), SecurityUtils.getTenantId(), file.getOriginalFilename());
public R uploadFile(@ApiParam(value = "图片文件", required = true) @RequestParam("file") MultipartFile file)
throws IOException {
String fileAddress = ossFileService.upload(file.getInputStream(), SecurityUtils.getTenantId(),
file.getOriginalFilename());
return R.ok(fileAddress);
}
/**
* 新增店员头像框
*/
@ApiOperation(value = "新增头像框", notes = "创建新的店员头像框信息")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "添加失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")})
@Log(title = "店员头像框", businessType = BusinessType.INSERT)
@PostMapping("/create")
public R create(@ApiParam(value = "头像框信息", required = true) @Validated @RequestBody PlayAvatarFrameInfoAddVo vo) {
boolean success = playAvatarFrameInfoService.create(ConvertUtil.entityToVo(vo, PlayAvatarFrameInfoEntity.class));
boolean success = playAvatarFrameInfoService
.create(ConvertUtil.entityToVo(vo, PlayAvatarFrameInfoEntity.class));
if (success) {
return R.ok();
}
@@ -99,13 +90,11 @@ public class PlayAvatarFrameInfoController {
*/
@ApiOperation(value = "修改头像框", notes = "根据ID修改店员头像框信息")
@ApiImplicitParam(name = "id", value = "头像框ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "修改失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")})
@Log(title = "店员头像框", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update/{id}")
public R update(@PathVariable String id, @ApiParam(value = "头像框信息", required = true) @RequestBody PlayAvatarFrameInfoEntity playAvatarFrameInfo) {
public R update(@PathVariable String id,
@ApiParam(value = "头像框信息", required = true) @RequestBody PlayAvatarFrameInfoEntity playAvatarFrameInfo) {
playAvatarFrameInfo.setId(id);
boolean success = playAvatarFrameInfoService.update(playAvatarFrameInfo);
if (success) {
@@ -119,9 +108,7 @@ public class PlayAvatarFrameInfoController {
*/
@ApiOperation(value = "删除头像框", notes = "根据ID批量删除店员头像框信息")
@ApiImplicitParam(name = "ids", value = "头像框ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = Integer.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)})
@Log(title = "店员头像框", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) {
@@ -132,13 +119,11 @@ public class PlayAvatarFrameInfoController {
* 新增店员头像框
*/
@ApiOperation(value = "赠送头像框", notes = "赠送头像框给指定店员")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "添加失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")})
@Log(title = "赠送店员头像框", businessType = BusinessType.INSERT)
@PostMapping("/sendAvatarFrame")
public R sendAvatarFrame(@ApiParam(value = "赠送信息", required = true) @Validated @RequestBody PlayAvatarFrameSendVo vo) {
public R sendAvatarFrame(
@ApiParam(value = "赠送信息", required = true) @Validated @RequestBody PlayAvatarFrameSendVo vo) {
return R.error("添加失败");
}

24
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkArticleInfoController.java
View File

@@ -13,16 +13,14 @@ import com.starry.common.result.R;
import com.starry.common.utils.ConvertUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 店员动态信息Controller
*
@@ -38,30 +36,24 @@ public class PlayClerkArticleInfoController {
@Resource
private IPlayCustomArticleInfoService playCustomArticleInfoService;
/**
* 查询店员动态信息列表
*/
@ApiOperation(value = "分页查询动态列表", notes = "分页查询店员动态信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkArticleReturnVo.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkArticleReturnVo.class, responseContainer = "Page")})
@PostMapping("/listByPage")
public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkArticleQueryVo vo) {
IPage<PlayClerkArticleReturnVo> list = playClerkArticleInfoService.selectByPage(vo,false);
IPage<PlayClerkArticleReturnVo> list = playClerkArticleInfoService.selectByPage(vo, false);
return R.ok(list);
}
/**
* 修改店员动态信息
*/
@ApiOperation(value = "修改动态审核状态", notes = "更新店员动态审核状态，通过或拒绝")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "修改失败")
})
//@PreAuthorize("@customSs.hasPermission('clerk:article:update')")
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")})
// @PreAuthorize("@customSs.hasPermission('clerk:article:update')")
@Log(title = "店员动态信息", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update")
public R update(@ApiParam(value = "审核状态信息", required = true) @RequestBody PlayClerkArticleReviewStateEditVo vo) {
@@ -78,10 +70,8 @@ public class PlayClerkArticleInfoController {
*/
@ApiOperation(value = "删除动态", notes = "根据ID批量删除店员动态信息")
@ApiImplicitParam(name = "ids", value = "动态ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功")
})
//@PreAuthorize("@customSs.hasPermission('clerk:article:delete')")
@ApiResponses({@ApiResponse(code = 200, message = "操作成功")})
// @PreAuthorize("@customSs.hasPermission('clerk:article:delete')")
@Log(title = "店员动态信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) {

40
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkClassificationInfoController.java
View File

@@ -8,15 +8,13 @@ import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.*;
/**
* 店员分类Controller
@@ -36,25 +34,23 @@ public class PlayClerkClassificationInfoController {
*/
@ApiOperation(value = "查询所有分类", notes = "获取所有店员分类信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkClassificationInfoEntity.class, responseContainer = "List")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkClassificationInfoEntity.class, responseContainer = "List")})
@GetMapping("/listAll")
public R listAll() {
List<PlayClerkClassificationInfoEntity> list = playClerkClassificationInfoService.selectAll();
return R.ok(list);
}
/**
* 查询店员分类列表
*/
@ApiOperation(value = "分页查询分类", notes = "分页查询店员分类信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkClassificationInfoEntity.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkClassificationInfoEntity.class, responseContainer = "Page")})
@GetMapping("/list")
public R list(@ApiParam(value = "查询条件") PlayClerkClassificationInfoEntity playClerkClassificationInfo) {
IPage<PlayClerkClassificationInfoEntity> list = playClerkClassificationInfoService.selectPlayClerkClassificationInfoByPage(playClerkClassificationInfo);
IPage<PlayClerkClassificationInfoEntity> list = playClerkClassificationInfoService
.selectPlayClerkClassificationInfoByPage(playClerkClassificationInfo);
return R.ok(list);
}
@@ -63,9 +59,7 @@ public class PlayClerkClassificationInfoController {
*/
@ApiOperation(value = "获取分类详情", notes = "根据ID获取店员分类详细信息")
@ApiImplicitParam(name = "id", value = "分类ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkClassificationInfoEntity.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkClassificationInfoEntity.class)})
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") String id) {
return R.ok(playClerkClassificationInfoService.selectPlayClerkClassificationInfoById(id));
@@ -75,13 +69,11 @@ public class PlayClerkClassificationInfoController {
* 新增店员分类
*/
@ApiOperation(value = "新增分类", notes = "创建新的店员分类信息")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "添加失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")})
@Log(title = "店员分类", businessType = BusinessType.INSERT)
@PostMapping("/create")
public R create(@ApiParam(value = "分类信息", required = true) @RequestBody PlayClerkClassificationInfoEntity playClerkClassificationInfo) {
public R create(
@ApiParam(value = "分类信息", required = true) @RequestBody PlayClerkClassificationInfoEntity playClerkClassificationInfo) {
boolean success = playClerkClassificationInfoService.create(playClerkClassificationInfo);
if (success) {
return R.ok();
@@ -94,13 +86,11 @@ public class PlayClerkClassificationInfoController {
*/
@ApiOperation(value = "修改分类", notes = "根据ID修改店员分类信息")
@ApiImplicitParam(name = "id", value = "分类ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "修改失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")})
@Log(title = "店员分类", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update/{id}")
public R update(@PathVariable String id, @ApiParam(value = "分类信息", required = true) @RequestBody PlayClerkClassificationInfoEntity playClerkClassificationInfo) {
public R update(@PathVariable String id,
@ApiParam(value = "分类信息", required = true) @RequestBody PlayClerkClassificationInfoEntity playClerkClassificationInfo) {
playClerkClassificationInfo.setId(id);
boolean success = playClerkClassificationInfoService.update(playClerkClassificationInfo);
if (success) {
@@ -114,9 +104,7 @@ public class PlayClerkClassificationInfoController {
*/
@ApiOperation(value = "删除分类", notes = "根据ID批量删除店员分类信息")
@ApiImplicitParam(name = "ids", value = "分类ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = Integer.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)})
@Log(title = "店员分类", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) {

41
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkCommodityController.java
View File

@@ -10,15 +10,13 @@ import com.starry.common.result.R;
import com.starry.common.utils.ConvertUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.*;
/**
* 陪聊服务项目Controller
@@ -38,25 +36,23 @@ public class PlayClerkCommodityController {
*/
@ApiOperation(value = "查询所有服务项目", notes = "获取所有陪聊服务项目列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityQueryVo.class, responseContainer = "List")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityQueryVo.class, responseContainer = "List")})
@GetMapping("/listAllCommodity")
public R listAllCommodity() {
List<PlayClerkCommodityEntity> list = playClerkCommodityService.selectAll();
return R.ok(ConvertUtil.entityToVoList(list, PlayClerkCommodityQueryVo.class));
}
/**
* 查询陪聊服务项目列表
*/
@ApiOperation(value = "分页查询服务项目", notes = "分页查询陪聊服务项目列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityEntity.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityEntity.class, responseContainer = "Page")})
@GetMapping("/list")
public R list(@ApiParam(value = "查询条件") PlayClerkCommodityEntity playClerkCommodity) {
IPage<PlayClerkCommodityEntity> list = playClerkCommodityService.selectPlayClerkCommodityByPage(playClerkCommodity);
IPage<PlayClerkCommodityEntity> list = playClerkCommodityService
.selectPlayClerkCommodityByPage(playClerkCommodity);
return R.ok(list);
}
@@ -65,9 +61,7 @@ public class PlayClerkCommodityController {
*/
@ApiOperation(value = "获取服务项目详情", notes = "根据ID获取陪聊服务项目详细信息")
@ApiImplicitParam(name = "id", value = "服务项目ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityEntity.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkCommodityEntity.class)})
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") String id) {
return R.ok(playClerkCommodityService.selectPlayClerkCommodityById(id));
@@ -77,13 +71,11 @@ public class PlayClerkCommodityController {
* 新增陪聊服务项目
*/
@ApiOperation(value = "新增服务项目", notes = "创建新的陪聊服务项目")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "添加失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")})
@Log(title = "陪聊服务项目", businessType = BusinessType.INSERT)
@PostMapping("/create")
public R create(@ApiParam(value = "服务项目信息", required = true) @RequestBody PlayClerkCommodityEntity playClerkCommodity) {
public R create(
@ApiParam(value = "服务项目信息", required = true) @RequestBody PlayClerkCommodityEntity playClerkCommodity) {
boolean success = playClerkCommodityService.create(playClerkCommodity);
if (success) {
return R.ok();
@@ -91,19 +83,16 @@ public class PlayClerkCommodityController {
return R.error("添加失败");
}
/**
* 修改陪聊服务项目
*/
@ApiOperation(value = "修改服务项目", notes = "根据ID修改陪聊服务项目信息")
@ApiImplicitParam(name = "id", value = "服务项目ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "修改失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")})
@Log(title = "陪聊服务项目", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update/{id}")
public R update(@PathVariable String id, @ApiParam(value = "服务项目信息", required = true) @RequestBody PlayClerkCommodityEntity playClerkCommodity) {
public R update(@PathVariable String id,
@ApiParam(value = "服务项目信息", required = true) @RequestBody PlayClerkCommodityEntity playClerkCommodity) {
playClerkCommodity.setId(id);
boolean success = playClerkCommodityService.update(playClerkCommodity);
if (success) {
@@ -117,9 +106,7 @@ public class PlayClerkCommodityController {
*/
@ApiOperation(value = "删除服务项目", notes = "根据ID批量删除陪聊服务项目")
@ApiImplicitParam(name = "ids", value = "服务项目ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = Integer.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)})
@Log(title = "陪聊服务项目", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) {

23
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkDataReviewInfoController.java
View File

@@ -10,16 +10,14 @@ import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 店员资料审核Controller
*
@@ -34,14 +32,12 @@ public class PlayClerkDataReviewInfoController {
@Resource
private IPlayClerkDataReviewInfoService playClerkDataReviewInfoService;
/**
* 查询店员资料审核列表
*/
@ApiOperation(value = "查询资料审核列表", notes = "分页查询店员资料审核列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkDataReviewReturnVo.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkDataReviewReturnVo.class, responseContainer = "Page")})
@PostMapping("/listByPage")
public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkDataReviewQueryVo vo) {
IPage<PlayClerkDataReviewReturnVo> list = playClerkDataReviewInfoService.selectByPage(vo);
@@ -52,13 +48,12 @@ public class PlayClerkDataReviewInfoController {
* 修改店员资料审核
*/
@ApiOperation(value = "修改资料审核状态", notes = "更新店员资料审核状态，通过或拒绝")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功")
})
//@PreAuthorize("@customSs.hasPermission('clerk:dataReview:update')")
@ApiResponses({@ApiResponse(code = 200, message = "操作成功")})
// @PreAuthorize("@customSs.hasPermission('clerk:dataReview:update')")
@Log(title = "店员资料审核", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update")
public R update(@ApiParam(value = "审核状态信息", required = true) @Validated @RequestBody PlayClerkDataReviewStateEditVo vo) {
public R update(
@ApiParam(value = "审核状态信息", required = true) @Validated @RequestBody PlayClerkDataReviewStateEditVo vo) {
playClerkDataReviewInfoService.updateDataReviewState(vo);
return R.ok();
}
@@ -68,10 +63,8 @@ public class PlayClerkDataReviewInfoController {
*/
@ApiOperation(value = "删除资料审核记录", notes = "根据ID批量删除店员资料审核记录")
@ApiImplicitParam(name = "ids", value = "审核记录ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = Integer.class)
})
//@PreAuthorize("@customSs.hasPermission('clerk:dataReview:delete')")
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)})
// @PreAuthorize("@customSs.hasPermission('clerk:dataReview:delete')")
@Log(title = "店员资料审核", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) {

26
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkLevelInfoController.java
View File

@@ -11,16 +11,14 @@ import com.starry.common.result.R;
import com.starry.common.utils.ConvertUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 店员等级Controller
*
@@ -39,8 +37,7 @@ public class PlayClerkLevelInfoController {
*/
@ApiOperation(value = "查询所有等级", notes = "获取所有店员等级信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkLevelInfoEntity.class, responseContainer = "List")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkLevelInfoEntity.class, responseContainer = "List")})
@GetMapping("/listAll")
public R listAll() {
return R.ok(playClerkLevelInfoService.selectAll());
@@ -51,9 +48,7 @@ public class PlayClerkLevelInfoController {
*/
@ApiOperation(value = "获取等级详情", notes = "根据ID获取店员等级详细信息")
@ApiImplicitParam(name = "id", value = "等级ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkLevelInfoEntity.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkLevelInfoEntity.class)})
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") String id) {
return R.ok(playClerkLevelInfoService.selectPlayClerkLevelInfoById(id));
@@ -63,10 +58,7 @@ public class PlayClerkLevelInfoController {
* 新增店员等级
*/
@ApiOperation(value = "新增等级", notes = "创建新的店员等级信息")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "添加失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")})
@Log(title = "店员等级", businessType = BusinessType.INSERT)
@PostMapping("/create")
public R create(@ApiParam(value = "等级信息", required = true) @RequestBody PlayClerkLevelAddVo vo) {
@@ -84,10 +76,7 @@ public class PlayClerkLevelInfoController {
* 修改店员等级
*/
@ApiOperation(value = "修改等级", notes = "修改店员等级信息")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "修改失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")})
@Log(title = "店员等级", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update")
public R update(@ApiParam(value = "等级信息", required = true) @Validated @RequestBody PlayClerkLevelEditVo vo) {
@@ -103,10 +92,7 @@ public class PlayClerkLevelInfoController {
* 删除店员等级
*/
@ApiOperation(value = "删除最高等级", notes = "删除系统中最高的店员等级")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "最后一级,不允许删除")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "最后一级,不允许删除")})
@Log(title = "店员等级", businessType = BusinessType.DELETE)
@DeleteMapping("delMaxLevel")
public R remove() {

27
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkPkController.java
View File

@@ -12,9 +12,8 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.*;
/**
* 店员pkController
@@ -34,8 +33,7 @@ public class PlayClerkPkController {
*/
@ApiOperation(value = "分页查询PK列表", notes = "分页查询店员PK信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkPkEntity.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkPkEntity.class, responseContainer = "Page")})
@GetMapping("/list")
public R list(@ApiParam(value = "查询条件") PlayClerkPkEntity playClerkPk) {
IPage<PlayClerkPkEntity> list = playClerkPkService.selectPlayClerkPkByPage(playClerkPk);
@@ -47,9 +45,7 @@ public class PlayClerkPkController {
*/
@ApiOperation(value = "获取PK详情", notes = "根据ID获取店员PK详细信息")
@ApiImplicitParam(name = "id", value = "PK记录ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkPkEntity.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkPkEntity.class)})
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") String id) {
return R.ok(playClerkPkService.selectPlayClerkPkById(id));
@@ -59,10 +55,7 @@ public class PlayClerkPkController {
* 新增店员pk
*/
@ApiOperation(value = "新增PK记录", notes = "创建新的店员PK信息")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "添加失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")})
@Log(title = "店员pk", businessType = BusinessType.INSERT)
@PostMapping("/create")
public R create(@ApiParam(value = "PK信息", required = true) @RequestBody PlayClerkPkEntity playClerkPk) {
@@ -78,13 +71,11 @@ public class PlayClerkPkController {
*/
@ApiOperation(value = "修改PK记录", notes = "根据ID修改店员PK信息")
@ApiImplicitParam(name = "id", value = "PK记录ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "修改失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")})
@Log(title = "店员pk", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update/{id}")
public R update(@PathVariable String id, @ApiParam(value = "PK信息", required = true) @RequestBody PlayClerkPkEntity playClerkPk) {
public R update(@PathVariable String id,
@ApiParam(value = "PK信息", required = true) @RequestBody PlayClerkPkEntity playClerkPk) {
playClerkPk.setId(id);
boolean success = playClerkPkService.update(playClerkPk);
if (success) {
@@ -98,9 +89,7 @@ public class PlayClerkPkController {
*/
@ApiOperation(value = "删除PK记录", notes = "根据ID批量删除店员PK信息")
@ApiImplicitParam(name = "ids", value = "PK记录ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = Integer.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)})
@Log(title = "店员pk", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) {

37
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkRankingInfoController.java
View File

@@ -10,16 +10,14 @@ import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 店员排行Controller
*
@@ -38,8 +36,7 @@ public class PlayClerkRankingInfoController {
*/
@ApiOperation(value = "查询排行列表", notes = "分页查询店员排行信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = IPlayClerkRankingInfoReturnVo.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = IPlayClerkRankingInfoReturnVo.class, responseContainer = "Page")})
@PostMapping("/listByPage")
public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody IPlayClerkRankingInfoQueryVo vo) {
IPage<IPlayClerkRankingInfoReturnVo> list = playClerkRankingInfoService.selectByPage(vo);
@@ -51,9 +48,7 @@ public class PlayClerkRankingInfoController {
*/
@ApiOperation(value = "获取排行详情", notes = "根据ID获取店员排行详细信息")
@ApiImplicitParam(name = "id", value = "排行ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkRankingInfoEntity.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkRankingInfoEntity.class)})
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") String id) {
return R.ok(playClerkRankingInfoService.selectPlayClerkRankingInfoById(id));
@@ -63,14 +58,12 @@ public class PlayClerkRankingInfoController {
* 新增店员排行
*/
@ApiOperation(value = "新增排行", notes = "创建新的店员排行记录")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "添加失败")
})
//@PreAuthorize("@customSs.hasPermission('clerk:ranking:add')")
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")})
// @PreAuthorize("@customSs.hasPermission('clerk:ranking:add')")
@Log(title = "店员排行", businessType = BusinessType.INSERT)
@PostMapping("/create")
public R create(@ApiParam(value = "排行信息", required = true) @RequestBody PlayClerkRankingInfoEntity playClerkRankingInfo) {
public R create(
@ApiParam(value = "排行信息", required = true) @RequestBody PlayClerkRankingInfoEntity playClerkRankingInfo) {
boolean success = playClerkRankingInfoService.create(playClerkRankingInfo);
if (success) {
return R.ok();
@@ -83,14 +76,12 @@ public class PlayClerkRankingInfoController {
*/
@ApiOperation(value = "修改排行", notes = "根据ID修改店员排行信息")
@ApiImplicitParam(name = "id", value = "排行ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "修改失败")
})
//@PreAuthorize("@customSs.hasPermission('clerk:ranking:update')")
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")})
// @PreAuthorize("@customSs.hasPermission('clerk:ranking:update')")
@Log(title = "店员排行", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update/{id}")
public R update(@PathVariable String id, @ApiParam(value = "排行信息", required = true) @RequestBody PlayClerkRankingInfoEntity playClerkRankingInfo) {
public R update(@PathVariable String id,
@ApiParam(value = "排行信息", required = true) @RequestBody PlayClerkRankingInfoEntity playClerkRankingInfo) {
playClerkRankingInfo.setId(id);
boolean success = playClerkRankingInfoService.update(playClerkRankingInfo);
if (success) {
@@ -104,10 +95,8 @@ public class PlayClerkRankingInfoController {
*/
@ApiOperation(value = "删除排行", notes = "根据ID批量删除店员排行信息")
@ApiImplicitParam(name = "ids", value = "排行ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = Integer.class)
})
//@PreAuthorize("@customSs.hasPermission('clerk:ranking:delete')")
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)})
// @PreAuthorize("@customSs.hasPermission('clerk:ranking:delete')")
@Log(title = "店员排行", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) {

36
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkTypeInfoController.java
View File

@@ -10,16 +10,14 @@ import com.starry.common.result.R;
import com.starry.common.utils.ConvertUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 店员分类信息Controller
*
@@ -38,8 +36,7 @@ public class PlayClerkTypeInfoController {
*/
@ApiOperation(value = "查询所有分类", notes = "获取所有店员分类信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkTypeInfoEntity.class, responseContainer = "List")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkTypeInfoEntity.class, responseContainer = "List")})
@GetMapping("/listByAll")
public R listByAll() {
return R.ok(playClerkTypeInfoService.selectByAll());
@@ -47,24 +44,19 @@ public class PlayClerkTypeInfoController {
@ApiOperation(value = "分页查询分类", notes = "分页查询店员分类信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkTypeInfoEntity.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkTypeInfoEntity.class, responseContainer = "Page")})
@PostMapping("/listByPage")
public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkTypeInfoQueryVo vo) {
public R listByPage(
@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkTypeInfoQueryVo vo) {
return R.ok(playClerkTypeInfoService.selectByPage(vo));
}
/**
/**
* 新增店员分类信息
*
* /** 新增店员分类信息
*/
@ApiOperation(value = "新增分类", notes = "创建新的店员分类信息")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "添加失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")})
@Log(title = "店员分类信息", businessType = BusinessType.INSERT)
@PostMapping("/create")
public R create(@ApiParam(value = "分类信息", required = true) @Validated @RequestBody PlayClerkTypeInfoAddVo vo) {
@@ -80,13 +72,11 @@ public class PlayClerkTypeInfoController {
*/
@ApiOperation(value = "修改分类", notes = "根据ID修改店员分类信息")
@ApiImplicitParam(name = "id", value = "分类ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "修改失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")})
@Log(title = "店员分类信息", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update/{id}")
public R update(@PathVariable String id, @ApiParam(value = "分类信息", required = true) @RequestBody PlayClerkTypeInfoEntity playClerkTypeInfo) {
public R update(@PathVariable String id,
@ApiParam(value = "分类信息", required = true) @RequestBody PlayClerkTypeInfoEntity playClerkTypeInfo) {
playClerkTypeInfo.setId(id);
boolean success = playClerkTypeInfoService.update(playClerkTypeInfo);
if (success) {
@@ -100,9 +90,7 @@ public class PlayClerkTypeInfoController {
*/
@ApiOperation(value = "删除分类", notes = "根据ID批量删除店员分类信息")
@ApiImplicitParam(name = "ids", value = "分类ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = Integer.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)})
@Log(title = "店员分类信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) {

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

@@ -19,17 +19,15 @@ import com.starry.common.result.R;
import com.starry.common.utils.ConvertUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* 店员Controller
*
@@ -51,8 +49,7 @@ public class PlayClerkUserInfoController {
*/
@ApiOperation(value = "分页查询店员列表", notes = "根据条件分页查询店员列表信息，支持多种筛选条件")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserReturnVo.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserReturnVo.class, responseContainer = "Page")})
@PostMapping("listByPage")
public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkUserQueryVo vo) {
IPage<PlayClerkUserReturnVo> list = playClerkUserInfoService.selectByPage(vo);
@@ -65,8 +62,7 @@ public class PlayClerkUserInfoController {
@ApiOperation(value = "按分类查询店员列表", notes = "根据店员分类ID查询所有属于该分类的店员列表")
@ApiImplicitParam(name = "id", value = "店员分类ID", required = true, paramType = "query", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoEntity.class, responseContainer = "List")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoEntity.class, responseContainer = "List")})
@GetMapping("listAllByTypeId")
public R listAllByTypeId(@RequestParam("id") String id) {
List<PlayClerkUserInfoEntity> list = playClerkUserInfoService.listAllByTypeId(id);
@@ -79,8 +75,7 @@ public class PlayClerkUserInfoController {
@ApiOperation(value = "按分组查询店员列表", notes = "根据店员分组ID查询所有属于该分组的店员列表")
@ApiImplicitParam(name = "id", value = "店员分组ID", required = true, paramType = "query", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoEntity.class, responseContainer = "List")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoEntity.class, responseContainer = "List")})
@GetMapping("listAllByGroupId")
public R listAllByGroupId(@RequestParam("id") String id) {
List<PlayClerkUserInfoEntity> list = playClerkUserInfoService.listAllByGroupId(id);
@@ -91,12 +86,11 @@ public class PlayClerkUserInfoController {
* 修改店员分类
*/
@ApiOperation(value = "修改店员分类", notes = "将指定店员分配到指定分类中，会先清空该分类下所有店员，再重新分配")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = String.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = String.class)})
@PostMapping("editClerkType")
public R listByPage(@ApiParam(value = "店员分类修改参数", required = true) @Validated @RequestBody PlayClerkUserTypeEditVo vo) {
//先清空当前分类下店员
public R listByPage(
@ApiParam(value = "店员分类修改参数", required = true) @Validated @RequestBody PlayClerkUserTypeEditVo vo) {
// 先清空当前分类下店员
List<PlayClerkUserInfoEntity> list = playClerkUserInfoService.listAllByTypeId(vo.getTypeId());
for (PlayClerkUserInfoEntity clerkUserInfo : list) {
PlayClerkUserInfoEntity entity = new PlayClerkUserInfoEntity();
@@ -114,18 +108,15 @@ public class PlayClerkUserInfoController {
return R.ok("成功");
}
/**
* 1、修改店员分组
* 2、将对应账号角色ID设为组长
* 1、修改店员分组 2、将对应账号角色ID设为组长
*/
@ApiOperation(value = "修改店员分组", notes = "将指定店员分配到指定分组中，会先清空该分组下所有店员，再重新分配，并可设置组长")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = String.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = String.class)})
@PostMapping("editClerkGroup")
public R editClerkGroup(@ApiParam(value = "店员分组修改参数", required = true) @Validated @RequestBody PlayClerkUserTypeEditVo vo) {
//先清空当前分类下店员
public R editClerkGroup(
@ApiParam(value = "店员分组修改参数", required = true) @Validated @RequestBody PlayClerkUserTypeEditVo vo) {
// 先清空当前分类下店员
List<PlayClerkUserInfoEntity> list = playClerkUserInfoService.listAllByGroupId(vo.getTypeId());
for (PlayClerkUserInfoEntity clerkUserInfo : list) {
PlayClerkUserInfoEntity entity = new PlayClerkUserInfoEntity();
@@ -140,14 +131,11 @@ public class PlayClerkUserInfoController {
playClerkUserInfoService.update(entity);
}
return R.ok("成功");
}
@ApiOperation(value = "获取简单列表", notes = "获取店员和客户的简单列表信息，用于下拉选择等场景")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = JSONObject.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = JSONObject.class)})
@GetMapping("/simple/list")
public R simpleList() {
List<PlayClerkUserInfoEntity> clerkList = playClerkUserInfoService.simpleList();
@@ -155,14 +143,12 @@ public class PlayClerkUserInfoController {
return R.ok(new JSONObject().fluentPut("clerkList", clerkList).fluentPut("customerList", customerList));
}
/**
* 查询店员列表
*/
@ApiOperation(value = "查询店员列表", notes = "分页查询店员信息列表，支持多种条件筛选，返回详细的店员信息")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoResultVo.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoResultVo.class, responseContainer = "Page")})
@GetMapping("/list")
public R list(@ApiParam(value = "查询条件") PlayClerkUserInfoQueryVo vo) {
IPage<PlayClerkUserInfoResultVo> list = playClerkUserInfoService.selectPlayClerkUserInfoByPage(vo);
@@ -174,62 +160,59 @@ public class PlayClerkUserInfoController {
*/
@ApiOperation(value = "获取店员详情", notes = "根据店员ID获取店员的详细信息")
@ApiImplicitParam(name = "id", value = "店员ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoEntity.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserInfoEntity.class)})
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") String id) {
return R.ok(playClerkUserInfoService.selectById(id));
}
//
// /**
// * 微信端口新增店员
// */
// @Log(title = "店员", businessType = BusinessType.INSERT)
// @PostMapping("/wx/add")
// public R add(@Validated @RequestBody PlayClerkUserAddToWxVo vo) {
// //微信申请成为店员，需要先创建账户。
// PlayUserInfoEntity userInfoEntity = ConvertUtil.entityToVo(vo, PlayUserInfoEntity.class);
// userInfoEntity.setId(IdUtils.getUuid());
// playUserInfoService.create(userInfoEntity);
// //账号创建完成后，创建店员
// PlayClerkUserInfoEntity clerkUserInfoEntity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class);
// clerkUserInfoEntity.setPlayUserId(userInfoEntity.getId());
// boolean success = playClerkUserInfoService.create(clerkUserInfoEntity);
// if (success) {
// clerkCommodityService.initClerkCommodity(userInfoEntity.getId());
// return R.ok();
// }
// return R.error("添加失败");
// }
//
// /**
// * 微信端口新增店员
// */
// @Log(title = "店员", businessType = BusinessType.INSERT)
// @PostMapping("/wx/add")
// public R add(@Validated @RequestBody PlayClerkUserAddToWxVo vo) {
// //微信申请成为店员，需要先创建账户。
// PlayUserInfoEntity userInfoEntity = ConvertUtil.entityToVo(vo,
// PlayUserInfoEntity.class);
// userInfoEntity.setId(IdUtils.getUuid());
// playUserInfoService.create(userInfoEntity);
// //账号创建完成后，创建店员
// PlayClerkUserInfoEntity clerkUserInfoEntity = ConvertUtil.entityToVo(vo,
// PlayClerkUserInfoEntity.class);
// clerkUserInfoEntity.setPlayUserId(userInfoEntity.getId());
// boolean success = playClerkUserInfoService.create(clerkUserInfoEntity);
// if (success) {
// clerkCommodityService.initClerkCommodity(userInfoEntity.getId());
// return R.ok();
// }
// return R.error("添加失败");
// }
// /**
// * 新增店员
// */
// @Log(title = "店员", businessType = BusinessType.INSERT)
// @PostMapping("/create")
// public R create(@Validated @RequestBody PlayClerkUserAddVo vo) {
// PlayClerkUserInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class);
// boolean success = playClerkUserInfoService.create(entity);
// if (success) {
// clerkCommodityService.initClerkCommodity(vo.getPlayUserId());
// return R.ok();
// }
// return R.error("添加失败");
// }
// /**
// * 新增店员
// */
// @Log(title = "店员", businessType = BusinessType.INSERT)
// @PostMapping("/create")
// public R create(@Validated @RequestBody PlayClerkUserAddVo vo) {
// PlayClerkUserInfoEntity entity = ConvertUtil.entityToVo(vo,
// PlayClerkUserInfoEntity.class);
// boolean success = playClerkUserInfoService.create(entity);
// if (success) {
// clerkCommodityService.initClerkCommodity(vo.getPlayUserId());
// return R.ok();
// }
// return R.error("添加失败");
// }
/**
* 修改店员
*/
//@PreAuthorize("@customSs.hasPermission('clerk:user:update')")
// @PreAuthorize("@customSs.hasPermission('clerk:user:update')")
@Log(title = "店员", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改店员信息", notes = "修改店员的基本信息，如昵称、头像、签名等")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "修改失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")})
@PostMapping(value = "/update")
public R update(@ApiParam(value = "店员信息", required = true) @Validated @RequestBody PlayClerkUserEditVo vo) {
PlayClerkUserInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class);
@@ -240,19 +223,16 @@ public class PlayClerkUserInfoController {
return R.error("修改失败");
}
/**
* 修改店员状态
*/
//@PreAuthorize("@customSs.hasPermission('clerk:user:update')")
// @PreAuthorize("@customSs.hasPermission('clerk:user:update')")
@Log(title = "店员", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改店员状态", notes = "修改店员的状态信息，如上下架状态、推荐状态、在线状态等")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "修改失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")})
@PostMapping(value = "/updateState")
public R updateState(@ApiParam(value = "店员状态信息", required = true) @Validated @RequestBody PlayClerkUserStateEditVo vo) {
public R updateState(
@ApiParam(value = "店员状态信息", required = true) @Validated @RequestBody PlayClerkUserStateEditVo vo) {
PlayClerkUserInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class);
boolean success = playClerkUserInfoService.update(entity);
if (success) {
@@ -264,13 +244,11 @@ public class PlayClerkUserInfoController {
/**
* 删除店员
*/
//@PreAuthorize("@customSs.hasPermission('clerk:user:remove')")
// @PreAuthorize("@customSs.hasPermission('clerk:user:remove')")
@Log(title = "店员", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除店员", notes = "根据ID批量删除店员信息")
@ApiImplicitParam(name = "ids", value = "店员ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = Integer.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)})
@DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) {
return R.ok(playClerkUserInfoService.deletePlayClerkUserInfoByIds(ids));

25
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserReviewInfoController.java
View File

@@ -10,16 +10,14 @@ import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 店员资料审核Controller
*
@@ -38,10 +36,10 @@ public class PlayClerkUserReviewInfoController {
*/
@ApiOperation(value = "查询审核列表", notes = "分页查询店员资料审核列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserReviewReturnVo.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUserReviewReturnVo.class, responseContainer = "Page")})
@PostMapping("/listByPage")
public R listByPage(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkUserReviewQueryVo vo) {
public R listByPage(
@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkUserReviewQueryVo vo) {
IPage<PlayClerkUserReviewReturnVo> list = playClerkUserReviewInfoService.selectByPage(vo);
return R.ok(list);
}
@@ -50,13 +48,12 @@ public class PlayClerkUserReviewInfoController {
* 修改店员资料审核
*/
@ApiOperation(value = "修改审核状态", notes = "更新店员资料审核状态，通过或拒绝")
@ApiResponses({
@ApiResponse(code = 200, message = "修改成功")
})
//@PreAuthorize("@customSs.hasPermission('clerk:userReview:update')")
@ApiResponses({@ApiResponse(code = 200, message = "修改成功")})
// @PreAuthorize("@customSs.hasPermission('clerk:userReview:update')")
@Log(title = "店员资料审核", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update")
public R update(@ApiParam(value = "审核状态信息", required = true) @Validated @RequestBody PlayClerkUserReviewStateEditVo vo) {
public R update(
@ApiParam(value = "审核状态信息", required = true) @Validated @RequestBody PlayClerkUserReviewStateEditVo vo) {
playClerkUserReviewInfoService.updateDataReviewState(vo);
return R.ok("修改成功");
}
@@ -66,10 +63,8 @@ public class PlayClerkUserReviewInfoController {
*/
@ApiOperation(value = "删除审核记录", notes = "根据ID批量删除店员资料审核记录")
@ApiImplicitParam(name = "ids", value = "审核记录ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = Integer.class)
})
//@PreAuthorize("@customSs.hasPermission('clerk:userReview:delete')")
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)})
// @PreAuthorize("@customSs.hasPermission('clerk:userReview:delete')")
@Log(title = "店员资料审核", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) {

34
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesDetailsInfoController.java
View File

@@ -8,14 +8,12 @@ import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.*;
/**
* 店员工资明细信息Controller
@@ -35,11 +33,11 @@ public class PlayClerkWagesDetailsInfoController {
*/
@ApiOperation(value = "查询工资明细列表", notes = "分页查询店员工资明细信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkWagesDetailsInfoEntity.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkWagesDetailsInfoEntity.class, responseContainer = "Page")})
@GetMapping("/list")
public R list(@ApiParam(value = "查询条件") PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) {
IPage<PlayClerkWagesDetailsInfoEntity> list = playClerkWagesDetailsInfoService.selectPlayClerkWagesDetailsInfoByPage(playClerkWagesDetailsInfo);
IPage<PlayClerkWagesDetailsInfoEntity> list = playClerkWagesDetailsInfoService
.selectPlayClerkWagesDetailsInfoByPage(playClerkWagesDetailsInfo);
return R.ok(list);
}
@@ -48,9 +46,7 @@ public class PlayClerkWagesDetailsInfoController {
*/
@ApiOperation(value = "获取工资明细详情", notes = "根据ID获取店员工资明细详细信息")
@ApiImplicitParam(name = "id", value = "工资明细ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkWagesDetailsInfoEntity.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayClerkWagesDetailsInfoEntity.class)})
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") String id) {
return R.ok(playClerkWagesDetailsInfoService.selectPlayClerkWagesDetailsInfoById(id));
@@ -60,13 +56,11 @@ public class PlayClerkWagesDetailsInfoController {
* 新增店员工资明细信息
*/
@ApiOperation(value = "新增工资明细", notes = "创建新的店员工资明细记录")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "添加失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")})
@Log(title = "店员工资明细信息", businessType = BusinessType.INSERT)
@PostMapping("/create")
public R create(@ApiParam(value = "工资明细信息", required = true) @RequestBody PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) {
public R create(
@ApiParam(value = "工资明细信息", required = true) @RequestBody PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) {
boolean success = playClerkWagesDetailsInfoService.create(playClerkWagesDetailsInfo);
if (success) {
return R.ok();
@@ -79,13 +73,11 @@ public class PlayClerkWagesDetailsInfoController {
*/
@ApiOperation(value = "修改工资明细", notes = "根据ID修改店员工资明细信息")
@ApiImplicitParam(name = "id", value = "工资明细ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "修改失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")})
@Log(title = "店员工资明细信息", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update/{id}")
public R update(@PathVariable String id, @ApiParam(value = "工资明细信息", required = true) @RequestBody PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) {
public R update(@PathVariable String id,
@ApiParam(value = "工资明细信息", required = true) @RequestBody PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) {
playClerkWagesDetailsInfo.setId(id);
boolean success = playClerkWagesDetailsInfoService.update(playClerkWagesDetailsInfo);
if (success) {
@@ -99,9 +91,7 @@ public class PlayClerkWagesDetailsInfoController {
*/
@ApiOperation(value = "删除工资明细", notes = "根据ID批量删除店员工资明细信息")
@ApiImplicitParam(name = "ids", value = "工资明细ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = Integer.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)})
@Log(title = "店员工资明细信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) {

25
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesInfoController.java
View File

@@ -16,18 +16,16 @@ import com.starry.common.result.R;
import com.starry.common.utils.ConvertUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
* 店员工资结算信息Controller
@@ -52,9 +50,7 @@ public class PlayClerkWagesInfoController {
* 查询店员工资结算信息列表
*/
@ApiOperation(value = "查询历史工资列表", notes = "分页查询店员历史工资结算信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = Object.class, responseContainer = "Page")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Object.class, responseContainer = "Page")})
@PostMapping("/listByPage")
public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkWagesInfoQueryVo vo) {
return R.ok(playClerkWagesInfoService.selectHistoricalByPage(vo));
@@ -65,10 +61,10 @@ public class PlayClerkWagesInfoController {
*/
@ApiOperation(value = "查询未结算工资", notes = "分页查询店员未结算工资信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUnsettledWagesInfoReturnVo.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayClerkUnsettledWagesInfoReturnVo.class, responseContainer = "Page")})
@PostMapping("/listUnsettledWagesByPage")
public R list(@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkUnsettledWagesInfoQueryVo vo) {
public R list(
@ApiParam(value = "查询条件", required = true) @Validated @RequestBody PlayClerkUnsettledWagesInfoQueryVo vo) {
IPage<PlayClerkUnsettledWagesInfoReturnVo> page = playClerkUserInfoService.listUnsettledWagesByPage(vo);
for (PlayClerkUnsettledWagesInfoReturnVo record : page.getRecords()) {
Integer orderState1Number = 0;
@@ -105,13 +101,11 @@ public class PlayClerkWagesInfoController {
return R.ok(page);
}
@ApiOperation(value = "查询工资明细", notes = "根据工资结算ID查询工资明细信息")
@ApiImplicitParam(name = "id", value = "工资结算ID", required = true, paramType = "query", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = ClerkWagesDetailsReturnVo.class, responseContainer = "List"),
@ApiResponse(code = 500, message = "ID不能为空")
})
@ApiResponse(code = 200, message = "操作成功", response = ClerkWagesDetailsReturnVo.class, responseContainer = "List"),
@ApiResponse(code = 500, message = "ID不能为空")})
@GetMapping("queryWagesDetailsById")
public R clerkQueryWagesDetails(@RequestParam("id") String id) {
if (StrUtil.isBlankIfStr(id)) {
@@ -125,5 +119,4 @@ public class PlayClerkWagesInfoController {
return R.ok(returnVos);
}
}

34
play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayCustomArticleInfoController.java
View File

@@ -8,16 +8,14 @@ import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import javax.annotation.Resource;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 陪聊点赞动态信息Controller
*
@@ -36,11 +34,11 @@ public class PlayCustomArticleInfoController {
*/
@ApiOperation(value = "查询动态列表", notes = "分页查询陪聊点赞动态信息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayCustomArticleInfoEntity.class, responseContainer = "Page")
})
@ApiResponse(code = 200, message = "操作成功", response = PlayCustomArticleInfoEntity.class, responseContainer = "Page")})
@GetMapping("/list")
public R list(@ApiParam(value = "查询条件") PlayCustomArticleInfoEntity playCustomArticleInfo) {
IPage<PlayCustomArticleInfoEntity> list = playCustomArticleInfoService.selectPlayCustomArticleInfoByPage(playCustomArticleInfo);
IPage<PlayCustomArticleInfoEntity> list = playCustomArticleInfoService
.selectPlayCustomArticleInfoByPage(playCustomArticleInfo);
return R.ok(list);
}
@@ -49,9 +47,7 @@ public class PlayCustomArticleInfoController {
*/
@ApiOperation(value = "获取动态详情", notes = "根据ID获取陪聊点赞动态详细信息")
@ApiImplicitParam(name = "id", value = "动态ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = PlayCustomArticleInfoEntity.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = PlayCustomArticleInfoEntity.class)})
@PreAuthorize("@customSs.hasPermission('play:info:query')")
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") String id) {
@@ -62,14 +58,12 @@ public class PlayCustomArticleInfoController {
* 新增陪聊点赞动态信息
*/
@ApiOperation(value = "新增动态", notes = "创建新的陪聊点赞动态信息")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "添加失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "添加失败")})
@PreAuthorize("@customSs.hasPermission('play:info:create')")
@Log(title = "陪聊点赞动态信息", businessType = BusinessType.INSERT)
@PostMapping("/create")
public R create(@ApiParam(value = "动态信息", required = true) @RequestBody PlayCustomArticleInfoEntity playCustomArticleInfo) {
public R create(
@ApiParam(value = "动态信息", required = true) @RequestBody PlayCustomArticleInfoEntity playCustomArticleInfo) {
boolean success = playCustomArticleInfoService.create(playCustomArticleInfo);
if (success) {
return R.ok();
@@ -82,14 +76,12 @@ public class PlayCustomArticleInfoController {
*/
@ApiOperation(value = "修改动态", notes = "根据ID修改陪聊点赞动态信息")
@ApiImplicitParam(name = "id", value = "动态ID", required = true, paramType = "path", dataType = "String", example = "1")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功"),
@ApiResponse(code = 500, message = "修改失败")
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功"), @ApiResponse(code = 500, message = "修改失败")})
@PreAuthorize("@customSs.hasPermission('play:info:edit')")
@Log(title = "陪聊点赞动态信息", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update/{id}")
public R update(@PathVariable String id, @ApiParam(value = "动态信息", required = true) @RequestBody PlayCustomArticleInfoEntity playCustomArticleInfo) {
public R update(@PathVariable String id,
@ApiParam(value = "动态信息", required = true) @RequestBody PlayCustomArticleInfoEntity playCustomArticleInfo) {
playCustomArticleInfo.setId(id);
boolean success = playCustomArticleInfoService.update(playCustomArticleInfo);
if (success) {
@@ -103,9 +95,7 @@ public class PlayCustomArticleInfoController {
*/
@ApiOperation(value = "删除动态", notes = "根据ID批量删除陪聊点赞动态信息")
@ApiImplicitParam(name = "ids", value = "动态ID数组", required = true, paramType = "path", dataType = "String[]", example = "1,2,3")
@ApiResponses({
@ApiResponse(code = 200, message = "操作成功", response = Integer.class)
})
@ApiResponses({@ApiResponse(code = 200, message = "操作成功", response = Integer.class)})
@PreAuthorize("@customSs.hasPermission('play:info:remove')")
@Log(title = "陪聊点赞动态信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")

2
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayAvatarFrameInfoMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayAvatarFrameInfoEntity;
@@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayAvatarFrameInfoEntity;
*/
public interface PlayAvatarFrameInfoMapper extends BaseMapper<PlayAvatarFrameInfoEntity> {
}

2
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkArticleInfoMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkArticleInfoEntity;
@@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkArticleInfoEntity;
*/
public interface PlayClerkArticleInfoMapper extends MPJBaseMapper<PlayClerkArticleInfoEntity> {
}

4
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkClassificationInfoMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkClassificationInfoEntity;
@@ -8,9 +7,8 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkClassificationInfoE
* 店员分类Mapper接口
*
* @author admin
* @since 2024-04-06
* @since 2024-04-06
*/
public interface PlayClerkClassificationInfoMapper extends BaseMapper<PlayClerkClassificationInfoEntity> {
}

2
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkCommodityMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkCommodityEntity;
@@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkCommodityEntity;
*/
public interface PlayClerkCommodityMapper extends BaseMapper<PlayClerkCommodityEntity> {
}

2
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkDataReviewInfoMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkDataReviewInfoEntity;
@@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkDataReviewInfoEntit
*/
public interface PlayClerkDataReviewInfoMapper extends MPJBaseMapper<PlayClerkDataReviewInfoEntity> {
}

4
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkLevelInfoMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity;
@@ -8,9 +7,8 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity;
* 店员等级Mapper接口
*
* @author admin
* @since 2024-03-30
* @since 2024-03-30
*/
public interface PlayClerkLevelInfoMapper extends BaseMapper<PlayClerkLevelInfoEntity> {
}

2
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkPkMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkPkEntity;
@@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkPkEntity;
*/
public interface PlayClerkPkMapper extends BaseMapper<PlayClerkPkEntity> {
}

2
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkRankingInfoMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkRankingInfoEntity;
@@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkRankingInfoEntity;
*/
public interface PlayClerkRankingInfoMapper extends MPJBaseMapper<PlayClerkRankingInfoEntity> {
}

2
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeInfoMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeInfoEntity;
@@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeInfoEntity;
*/
public interface PlayClerkTypeInfoMapper extends MPJBaseMapper<PlayClerkTypeInfoEntity> {
}

2
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeUserInfoMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeUserInfoEntity;
@@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeUserInfoEntity;
*/
public interface PlayClerkTypeUserInfoMapper extends BaseMapper<PlayClerkTypeUserInfoEntity> {
}

5
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserInfoMapper.java
View File

@@ -1,17 +1,14 @@
package com.starry.admin.modules.clerk.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
/**
* 店员Mapper接口
*
* @author admin
* @since 2024-03-30
* @since 2024-03-30
*/
public interface PlayClerkUserInfoMapper extends MPJBaseMapper<PlayClerkUserInfoEntity> {
}

4
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserReviewInfoMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkUserReviewInfoEntity;
@@ -8,9 +7,8 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkUserReviewInfoEntit
* 店员资料审核Mapper接口
*
* @author admin
* @since 2024-05-19
* @since 2024-05-19
*/
public interface PlayClerkUserReviewInfoMapper extends MPJBaseMapper<PlayClerkUserReviewInfoEntity> {
}

2
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesDetailsInfoMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesDetailsInfoEntity;
@@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesDetailsInfoEnt
*/
public interface PlayClerkWagesDetailsInfoMapper extends BaseMapper<PlayClerkWagesDetailsInfoEntity> {
}

2
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesInfoMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesInfoEntity;
@@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesInfoEntity;
*/
public interface PlayClerkWagesInfoMapper extends MPJBaseMapper<PlayClerkWagesInfoEntity> {
}

2
play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayCustomArticleInfoMapper.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity;
@@ -12,5 +11,4 @@ import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity;
*/
public interface PlayCustomArticleInfoMapper extends BaseMapper<PlayCustomArticleInfoEntity> {
}

5
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/ClerkPkEnum.java
View File

@@ -11,10 +11,7 @@ import lombok.Getter;
@AllArgsConstructor
public enum ClerkPkEnum {
TO_BE_STARTED("TO_BE_STARTED", "待开始"),
IN_PROGRESS("IN_PROGRESS", "进行中"),
FINISHED("FINISHED", "已完成"),
;
TO_BE_STARTED("TO_BE_STARTED", "待开始"), IN_PROGRESS("IN_PROGRESS", "进行中"), FINISHED("FINISHED", "已完成"),;
@Getter
private String value;

7
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/IPlayClerkRankingInfoQueryVo.java
View File

@@ -2,12 +2,11 @@ package com.starry.admin.modules.clerk.module.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.starry.common.domain.BasePageEntity;
import java.time.LocalDate;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
/**
* @author admin
* @since 2024/6/7 上午9:49
@@ -26,19 +25,16 @@ public class IPlayClerkRankingInfoQueryVo extends BasePageEntity {
*/
private String historicalStatistics;
/**
* 店员ID
*/
private String clerkId;
/**
* 店员性别
*/
private String sex;
/**
* 统计时间
*/
@@ -46,5 +42,4 @@ public class IPlayClerkRankingInfoQueryVo extends BasePageEntity {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate settlementDate;
}

8
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/IPlayClerkRankingInfoReturnVo.java
View File

@@ -1,11 +1,10 @@
package com.starry.admin.modules.clerk.module.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
/**
* @author admin
@@ -34,7 +33,6 @@ public class IPlayClerkRankingInfoReturnVo {
*/
private String clerkSex;
/**
* 店员昵称
*/
@@ -45,7 +43,6 @@ public class IPlayClerkRankingInfoReturnVo {
*/
private String clerkGroupName;
/**
* 排序名次
*/
@@ -95,7 +92,6 @@ public class IPlayClerkRankingInfoReturnVo {
*/
private BigDecimal orderContinueProportion = BigDecimal.ZERO;
/**
* 用户数
*/

5
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayAvatarFrameInfoEntity.java
View File

@@ -2,11 +2,10 @@ package com.starry.admin.modules.clerk.module.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.starry.common.domain.BaseEntity;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
/**
* 店员头像框对象 play_avatar_frame_info
*
@@ -18,7 +17,6 @@ import java.time.LocalDateTime;
@TableName("play_avatar_frame_info")
public class PlayAvatarFrameInfoEntity extends BaseEntity<PlayAvatarFrameInfoEntity> {
/**
* UUID
*/
@@ -64,5 +62,4 @@ public class PlayAvatarFrameInfoEntity extends BaseEntity<PlayAvatarFrameInfoEnt
*/
private LocalDateTime addTime;
}

9
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkArticleInfoEntity.java
View File

@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.starry.admin.common.conf.StringTypeHandler;
import com.starry.common.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 店员动态信息对象 play_clerk_article_info
@@ -21,7 +20,6 @@ import java.util.List;
@TableName(value = "play_clerk_article_info", autoResultMap = true)
public class PlayClerkArticleInfoEntity extends BaseEntity<PlayClerkArticleInfoEntity> {
/**
* UUID
*/
@@ -42,7 +40,6 @@ public class PlayClerkArticleInfoEntity extends BaseEntity<PlayClerkArticleInfoE
*/
private String articleCon;
/**
* 动态附件类型（0:图片;1:视频;2:音频）
*/
@@ -54,7 +51,6 @@ public class PlayClerkArticleInfoEntity extends BaseEntity<PlayClerkArticleInfoE
@TableField(typeHandler = StringTypeHandler.class)
private List<String> annexCon;
/**
* 发布时间
*/
@@ -75,5 +71,4 @@ public class PlayClerkArticleInfoEntity extends BaseEntity<PlayClerkArticleInfoE
*/
private String reviewCon;
}

2
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkClassificationInfoEntity.java
View File

@@ -16,7 +16,6 @@ import lombok.EqualsAndHashCode;
@TableName("play_clerk_classification_info")
public class PlayClerkClassificationInfoEntity extends BaseEntity<PlayClerkClassificationInfoEntity> {
/**
* UUID
*/
@@ -37,5 +36,4 @@ public class PlayClerkClassificationInfoEntity extends BaseEntity<PlayClerkClass
*/
private Integer sort;
}

7
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkCommodityEntity.java
View File

@@ -16,7 +16,6 @@ import lombok.EqualsAndHashCode;
@TableName("play_clerk_commodity_info")
public class PlayClerkCommodityEntity extends BaseEntity<PlayClerkCommodityEntity> {
/**
* UUID
*/
@@ -37,7 +36,6 @@ public class PlayClerkCommodityEntity extends BaseEntity<PlayClerkCommodityEntit
*/
private String commodityId;
/**
* 服务项目名称
*/
@@ -49,11 +47,8 @@ public class PlayClerkCommodityEntity extends BaseEntity<PlayClerkCommodityEntit
private Integer sort;
/**
* 服务启动状态
* 0:停用
* 1:启用
* 服务启动状态 0:停用 1:启用
*/
private String enablingState;
}

7
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoEditVo.java
View File

@@ -13,7 +13,6 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = false)
public class PlayClerkDataReviewInfoEditVo {
/**
* UUID
*/
@@ -25,10 +24,7 @@ public class PlayClerkDataReviewInfoEditVo {
private String dataType;
/**
* 审核状态
* 0：未审核
* 1：审核通过
* 2：审核未通过
* 审核状态 0：未审核 1：审核通过 2：审核未通过
*/
private String state;
@@ -37,5 +33,4 @@ public class PlayClerkDataReviewInfoEditVo {
*/
private String remark;
}

6
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoEntity.java
View File

@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.starry.admin.utils.ListToStringHandle;
import com.starry.common.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 店员资料审核对象 play_clerk_data_review_info
@@ -21,7 +20,6 @@ import java.util.List;
@TableName(value = "play_clerk_data_review_info", autoResultMap = true)
public class PlayClerkDataReviewInfoEntity extends BaseEntity<PlayClerkDataReviewInfoEntity> {
/**
* UUID
*/

11
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoQueryVo.java
View File

@@ -1,11 +1,10 @@
package com.starry.admin.modules.clerk.module.entity;
import com.starry.common.domain.BasePageEntity;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 店员申请对象 play_clerk_data_review_info
*
@@ -16,13 +15,11 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = false)
public class PlayClerkDataReviewInfoQueryVo extends BasePageEntity {
/**
* UUID
*/
private String id;
/**
* 资料类型[0:店员申请,1:头像;2:相册;3:录音]
*/
@@ -34,10 +31,7 @@ public class PlayClerkDataReviewInfoQueryVo extends BasePageEntity {
private String content;
/**
* 审核状态
* 0：未审核
* 1：审核通过
* 2：审核未通过
* 审核状态 0：未审核 1：审核通过 2：审核未通过
*/
private String state = "0";
@@ -61,5 +55,4 @@ public class PlayClerkDataReviewInfoQueryVo extends BasePageEntity {
*/
private String remark;
}

3
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java
View File

@@ -16,7 +16,6 @@ import lombok.EqualsAndHashCode;
@TableName("play_clerk_level_info")
public class PlayClerkLevelInfoEntity extends BaseEntity<PlayClerkLevelInfoEntity> {
/**
* UUID
*/
@@ -69,5 +68,5 @@ public class PlayClerkLevelInfoEntity extends BaseEntity<PlayClerkLevelInfoEntit
private Integer styleType;
private String styleImageUrl;
private String styleImageUrl;
}

6
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkPkEntity.java
View File

@@ -2,11 +2,10 @@ package com.starry.admin.modules.clerk.module.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.starry.common.domain.BaseEntity;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 店员pk对象 play_clerk_pk
*
@@ -18,7 +17,6 @@ import java.util.Date;
@TableName("play_clerk_pk")
public class PlayClerkPkEntity extends BaseEntity<PlayClerkPkEntity> {
/**
* UUID
*/
@@ -49,7 +47,6 @@ public class PlayClerkPkEntity extends BaseEntity<PlayClerkPkEntity> {
*/
private Date updatedTime;
/**
* 数据版本
*/
@@ -90,5 +87,4 @@ public class PlayClerkPkEntity extends BaseEntity<PlayClerkPkEntity> {
*/
private String status;
}

8
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkRankingInfoEntity.java
View File

@@ -3,13 +3,12 @@ package com.starry.admin.modules.clerk.module.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.starry.common.domain.BaseEntity;
import java.math.BigDecimal;
import java.time.LocalDate;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
* 店员排行对象 play_clerk_ranking_info
*
@@ -21,7 +20,6 @@ import java.time.LocalDate;
@TableName("play_clerk_ranking_info")
public class PlayClerkRankingInfoEntity extends BaseEntity<PlayClerkRankingInfoEntity> {
/**
* UUID
*/
@@ -37,7 +35,6 @@ public class PlayClerkRankingInfoEntity extends BaseEntity<PlayClerkRankingInfoE
*/
private String clerkId;
/**
* 是否为历史统计(1:是;0:不是)
*/
@@ -123,5 +120,4 @@ public class PlayClerkRankingInfoEntity extends BaseEntity<PlayClerkRankingInfoE
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate settlementDate;
}

1
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeInfoEntity.java
View File

@@ -16,7 +16,6 @@ import lombok.EqualsAndHashCode;
@TableName("play_clerk_type_info")
public class PlayClerkTypeInfoEntity extends BaseEntity<PlayClerkTypeInfoEntity> {
/**
* UUID
*/

1
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeUserInfoEntity.java
View File

@@ -16,7 +16,6 @@ import lombok.EqualsAndHashCode;
@TableName("play_clerk_type_user_info")
public class PlayClerkTypeUserInfoEntity extends BaseEntity<PlayClerkTypeUserInfoEntity> {
/**
* UUID
*/

3
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserDetailResultVo.java
View File

@@ -1,8 +1,7 @@
package com.starry.admin.modules.clerk.module.entity;
import lombok.Data;
import java.util.List;
import lombok.Data;
/**
* @author admin

15
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserEvaluateInfoEntity.java
View File

@@ -1,8 +1,7 @@
package com.starry.admin.modules.clerk.module.entity;
import lombok.Data;
import java.util.Date;
import lombok.Data;
/**
* 店员评价信息
@@ -14,13 +13,11 @@ public class PlayClerkUserEvaluateInfoEntity {
private String id;
/**
* 评价人ID
*/
private String evaluatorId;
/**
* 评价人昵称
*/
@@ -41,7 +38,6 @@ public class PlayClerkUserEvaluateInfoEntity {
*/
private Date evaluateTime;
/**
* 订单ID
*/
@@ -72,8 +68,9 @@ public class PlayClerkUserEvaluateInfoEntity {
*/
public Integer likeCount;
public PlayClerkUserEvaluateInfoEntity(String id, String evaluatorId, String evaluatorUsername, String evaluatorAvatar, String con, Date evaluateTime, String orderId, String clerkUsername, String commodityId, String commodityName, String commodityUnit) {
public PlayClerkUserEvaluateInfoEntity(String id, String evaluatorId, String evaluatorUsername,
String evaluatorAvatar, String con, Date evaluateTime, String orderId, String clerkUsername,
String commodityId, String commodityName, String commodityUnit) {
this.id = id;
this.evaluatorId = evaluatorId;
this.evaluatorUsername = evaluatorUsername;
@@ -87,7 +84,9 @@ public class PlayClerkUserEvaluateInfoEntity {
this.commodityUnit = commodityUnit;
}
public PlayClerkUserEvaluateInfoEntity(String id, String evaluatorId, String evaluatorUsername, String evaluatorAvatar, String con, Date evaluateTime, String orderId, String clerkUsername, String commodityId, String commodityName, String commodityUnit, int likeCount) {
public PlayClerkUserEvaluateInfoEntity(String id, String evaluatorId, String evaluatorUsername,
String evaluatorAvatar, String con, Date evaluateTime, String orderId, String clerkUsername,
String commodityId, String commodityName, String commodityUnit, int likeCount) {
this.id = id;
this.evaluatorId = evaluatorId;
this.evaluatorUsername = evaluatorUsername;

11
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java
View File

@@ -6,13 +6,12 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.starry.admin.common.conf.StringTypeHandler;
import com.starry.common.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 店员对象 play_clerk_user_info
@@ -25,7 +24,6 @@ import java.util.List;
@TableName(value = "play_clerk_user_info", autoResultMap = true)
public class PlayClerkUserInfoEntity extends BaseEntity<PlayClerkUserInfoEntity> {
/**
* UUID
*/
@@ -158,7 +156,6 @@ public class PlayClerkUserInfoEntity extends BaseEntity<PlayClerkUserInfoEntity>
*/
private String onboardingState;
/**
* 入职时间
*/
@@ -178,7 +175,6 @@ public class PlayClerkUserInfoEntity extends BaseEntity<PlayClerkUserInfoEntity>
*/
private Integer workingHours = 0;
/**
* 是否推荐状态（1：已推荐，0：未推荐）
*/
@@ -243,7 +239,6 @@ public class PlayClerkUserInfoEntity extends BaseEntity<PlayClerkUserInfoEntity>
**/
private String alipayImage;
/**
* 创建时间
**/

7
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserQueryVo.java
View File

@@ -3,11 +3,10 @@ package com.starry.admin.modules.clerk.module.entity;
import com.starry.common.domain.BasePageEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* 店员对象 play_clerk_user_info
*
@@ -43,14 +42,12 @@ public class PlayClerkUserQueryVo extends BasePageEntity {
@ApiModelProperty(value = "分组ID")
private String groupId;
/**
* 性别[0:未知;1:男;2:女]
*/
@ApiModelProperty(value = "性别", notes = "0:未知;1:男;2:女")
private String sex;
/**
* 是否固定等级(0:固定等级，1:不固定)
*/
@@ -87,7 +84,6 @@ public class PlayClerkUserQueryVo extends BasePageEntity {
@ApiModelProperty(value = "所在城市", example = "深圳市")
private String city;
/**
* 在职状态（1：在职，0：离职）
*/
@@ -154,5 +150,4 @@ public class PlayClerkUserQueryVo extends BasePageEntity {
@ApiModelProperty(value = "身份证号")
private String code;
}

13
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java
View File

@@ -5,13 +5,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 店员分页查询对象
@@ -23,7 +22,6 @@ import java.util.List;
@ApiModel(value = "店员详细信息返回对象", description = "分页查询店员详细信息的返回结果")
public class PlayClerkUserReturnVo {
/**
* UUID
*/
@@ -48,21 +46,18 @@ public class PlayClerkUserReturnVo {
@ApiModelProperty(value = "店员等级名称")
private String levelName;
/**
* 分组ID
*/
@ApiModelProperty(value = "分组ID")
private String groupId;
/**
* 分组ID
*/
@ApiModelProperty(value = "分组名称")
private String groupName;
/**
* 性别[0:未知;1:男;2:女]
*/
@@ -195,7 +190,6 @@ public class PlayClerkUserReturnVo {
@ApiModelProperty(value = "添加时间", example = "2024-01-01 12:00:00")
private LocalDateTime addTime;
/**
* 入职时间
*/
@@ -236,19 +230,16 @@ public class PlayClerkUserReturnVo {
@ApiModelProperty(value = "是否固定等级", notes = "0:固定等级，1:不固定")
private String fixingLevel;
/**
* 在职状态（1：在职，0：离职）
*/
@ApiModelProperty(value = "在职状态", notes = "1：在职，0：离职")
private String onboardingState;
/**
* 在职天数
*/
@ApiModelProperty(value = "在职天数", example = "365")
private Integer workingHours = 0;
}

9
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReviewInfoEntity.java
View File

@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.starry.admin.common.conf.StringTypeHandler;
import com.starry.common.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 店员申请对象 play_clerk_user_review_info
@@ -92,7 +91,6 @@ public class PlayClerkUserReviewInfoEntity extends BaseEntity<PlayClerkUserRevie
*/
private LocalDateTime addTime;
/**
* 审核状态（0：未审核:1：审核通过，2：审核不通过）
*/
@@ -113,7 +111,4 @@ public class PlayClerkUserReviewInfoEntity extends BaseEntity<PlayClerkUserRevie
*/
private String reviewCon;
}

6
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserTrendsInfoEntity.java
View File

@@ -1,8 +1,7 @@
package com.starry.admin.modules.clerk.module.entity;
import lombok.Data;
import java.util.Date;
import lombok.Data;
/**
* 店员动态
@@ -14,7 +13,6 @@ public class PlayClerkUserTrendsInfoEntity {
private String id;
private String title;
/**
@@ -22,10 +20,8 @@ public class PlayClerkUserTrendsInfoEntity {
*/
private String type;
private String con;
private Date releaseTime;
public PlayClerkUserTrendsInfoEntity(String id, String title, String con, Date releaseTime) {

7
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserTypeEditVo.java
View File

@@ -2,10 +2,9 @@ package com.starry.admin.modules.clerk.module.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
import javax.validation.constraints.NotNull;
import lombok.Data;
/**
* 店员对象 play_clerk_user_info
@@ -17,7 +16,6 @@ import java.util.List;
@ApiModel(value = "店员分类编辑对象", description = "修改店员分类或分组的参数对象")
public class PlayClerkUserTypeEditVo {
/**
* 店员分类ID
*/
@@ -32,5 +30,4 @@ public class PlayClerkUserTypeEditVo {
@ApiModelProperty(value = "店员ID列表", required = true, notes = "要添加到分类/分组中的店员ID列表")
private List<String> clerkUserIds;
}

7
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesDetailsInfoEntity.java
View File

@@ -2,11 +2,10 @@ package com.starry.admin.modules.clerk.module.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.starry.common.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 店员工资明细信息对象 play_clerk_wages_details_info
@@ -19,7 +18,6 @@ import java.time.LocalDateTime;
@TableName("play_clerk_wages_details_info")
public class PlayClerkWagesDetailsInfoEntity extends BaseEntity<PlayClerkWagesDetailsInfoEntity> {
/**
* UUID
*/
@@ -65,5 +63,4 @@ public class PlayClerkWagesDetailsInfoEntity extends BaseEntity<PlayClerkWagesDe
*/
private LocalDateTime endOrderTime;
}

9
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesInfoEntity.java
View File

@@ -3,13 +3,12 @@ package com.starry.admin.modules.clerk.module.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.starry.common.domain.BaseEntity;
import java.math.BigDecimal;
import java.time.LocalDate;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
* 店员工资结算信息对象 play_clerk_wages_info
*
@@ -21,7 +20,6 @@ import java.time.LocalDate;
@TableName("play_clerk_wages_info")
public class PlayClerkWagesInfoEntity extends BaseEntity<PlayClerkWagesInfoEntity> {
/**
* UUID
*/
@@ -37,7 +35,6 @@ public class PlayClerkWagesInfoEntity extends BaseEntity<PlayClerkWagesInfoEntit
*/
private String clerkId;
/**
* 是否为往期统计(1:是;0:不是)
**/
@@ -67,7 +64,6 @@ public class PlayClerkWagesInfoEntity extends BaseEntity<PlayClerkWagesInfoEntit
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate endCountDate;
/**
* 结算时间
*/
@@ -110,5 +106,4 @@ public class PlayClerkWagesInfoEntity extends BaseEntity<PlayClerkWagesInfoEntit
*/
private BigDecimal estimatedRevenue;
}

6
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayCustomArticleInfoEntity.java
View File

@@ -2,11 +2,10 @@ package com.starry.admin.modules.clerk.module.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.starry.common.domain.BaseEntity;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
/**
* 陪聊点赞动态信息对象 play_custom_article_info
*
@@ -18,7 +17,6 @@ import java.time.LocalDateTime;
@TableName("play_custom_article_info")
public class PlayCustomArticleInfoEntity extends BaseEntity<PlayCustomArticleInfoEntity> {
/**
* UUID
*/
@@ -54,11 +52,9 @@ public class PlayCustomArticleInfoEntity extends BaseEntity<PlayCustomArticleInf
*/
private String endorseState;
/**
* 操作类型(1:关注;0:收藏)
*/
private String endorseType;
}

4
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayGiftInfoVo.java
View File

@@ -1,17 +1,16 @@
package com.starry.admin.modules.clerk.module.entity;
import lombok.Data;
/**
* 礼物信息
*
* @author admin
*/
@Data
public class PlayGiftInfoVo {
/**
* 礼物ID
*/
@@ -32,7 +31,6 @@ public class PlayGiftInfoVo {
*/
private Integer number;
/**
* 礼物状态（0：正常，1：已下架）
*/

5
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayAvatarFrameInfoAddVo.java
View File

@@ -3,12 +3,11 @@ package com.starry.admin.modules.clerk.module.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.time.LocalDateTime;
import javax.validation.constraints.NotNull;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
/**
* @author admin
* @since 2024/6/6 下午11:13

1
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayAvatarFrameInfoQueryVo.java
View File

@@ -2,7 +2,6 @@ package com.starry.admin.modules.clerk.module.vo;
import com.starry.common.domain.BasePageEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

5
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayAvatarFrameSendVo.java
View File

@@ -2,9 +2,8 @@ package com.starry.admin.modules.clerk.module.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import lombok.Data;
/**
* @author admin
@@ -14,11 +13,9 @@ import javax.validation.constraints.NotNull;
@ApiModel(value = "店员头像框赠送参数", description = "赠送头像框给店员的请求参数")
public class PlayAvatarFrameSendVo {
@ApiModelProperty(value = "店员ID", required = true, example = "1", notes = "接收头像框的店员ID")
private String clerkId;
@NotNull(message = "头像框获取方式不能为空")
@ApiModelProperty(value = "头像框ID", required = true, example = "1", notes = "要赠送的头像框ID")
private String avatarFrameId;

8
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleQueryVo.java
View File

@@ -3,14 +3,12 @@ package com.starry.admin.modules.clerk.module.vo;
import com.starry.common.domain.BasePageEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* @author admin
* 动态信息查询对象
* @author admin 动态信息查询对象
*/
@EqualsAndHashCode(callSuper = true)
@Data
@@ -20,7 +18,6 @@ public class PlayClerkArticleQueryVo extends BasePageEntity {
@ApiModelProperty(value = "动态ID", example = "1", notes = "特定动态的ID")
private String id;
/**
* 店员ID
*/
@@ -38,7 +35,6 @@ public class PlayClerkArticleQueryVo extends BasePageEntity {
@ApiModelProperty(value = "发布时间范围", example = "['2024-01-01 00:00:00','2024-12-31 23:59:59']", notes = "动态发布时间范围，包含开始和结束时间")
private List<String> releaseTime;
/**
* 顾客ID
*/

10
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReturnVo.java
View File

@@ -5,15 +5,13 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.time.LocalDateTime;
import java.util.List;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.List;
/**
* @author admin
* 动态信息查询返回对象
* @author admin 动态信息查询返回对象
*/
@Data
@ApiModel(value = "店员动态返回数据", description = "店员动态信息的返回数据")
@@ -48,7 +46,6 @@ public class PlayClerkArticleReturnVo {
@ApiModelProperty(value = "动态内容", example = "今天天气真好，感谢大家的支持！")
private String articleCon;
/**
* 动态附件类型（0:图片;1:视频;2:音频）
*/
@@ -61,7 +58,6 @@ public class PlayClerkArticleReturnVo {
@ApiModelProperty(value = "附件内容", example = "[\"https://example.com/photo1.jpg\"]", notes = "附件内容，根据附件类型有不同格式")
private List<String> annexCon;
/**
* 发布时间
*/

9
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReviewStateEditVo.java
View File

@@ -2,21 +2,18 @@ package com.starry.admin.modules.clerk.module.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.time.LocalDateTime;
import lombok.Data;
/**
* @author admin
* 动态审核
* @author admin 动态审核
*/
@Data
@ApiModel(value = "店员动态审核状态修改参数", description = "修改店员动态审核状态的请求参数")
public class PlayClerkArticleReviewStateEditVo {
@NotBlank(message = "ID不能为空")
@ApiModelProperty(value = "动态ID", required = true, example = "1", notes = "店员动态的ID")
private String id;

8
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityEditVo.java
View File

@@ -1,9 +1,8 @@
package com.starry.admin.modules.clerk.module.vo;
import lombok.Data;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import lombok.Data;
/**
* @author admin
@@ -17,11 +16,8 @@ public class PlayClerkCommodityEditVo {
@NotNull(message = "项目类型名称不能为空")
private String commodityType;
/**
* 服务启动状态
* 0:停用
* 1:启用
* 服务启动状态 0:停用 1:启用
*/
@NotNull(message = "服务状态不能为空")
@Pattern(regexp = "[01]", message = "服务状态必须为0或1")

5
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityQueryVo.java
View File

@@ -17,11 +17,8 @@ public class PlayClerkCommodityQueryVo {
@ApiModelProperty(value = "项目类型", example = "1", notes = "服务项目的类型")
private String commodityType;
/**
* 服务启动状态
* 0:停用
* 1:启用
* 服务启动状态 0:停用 1:启用
*/
@ApiModelProperty(value = "启用状态", example = "1", notes = "0:停用,1:启用")
private String enablingState;

3
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewQueryVo.java
View File

@@ -3,11 +3,10 @@ package com.starry.admin.modules.clerk.module.vo;
import com.starry.common.domain.BasePageEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* 店员资料审核对象 play_clerk_data_review_info
*

6
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java
View File

@@ -2,10 +2,9 @@ package com.starry.admin.modules.clerk.module.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
import lombok.Data;
/**
* 店员资料审核对象 play_clerk_data_review_info
@@ -17,14 +16,12 @@ import java.util.List;
@ApiModel(value = "店员资料内容审核返回数据", description = "店员资料内容审核信息的返回数据")
public class PlayClerkDataReviewReturnVo {
/**
* UUID
*/
@ApiModelProperty(value = "审核记录ID", example = "1")
private String id;
/**
* 店员ID
*/
@@ -43,7 +40,6 @@ public class PlayClerkDataReviewReturnVo {
@ApiModelProperty(value = "店员头像", example = "https://example.com/avatar.jpg")
private String clerkAvatar;
/**
* 资料类型[0:昵称;1:头像;2:相册;3:录音]
*/

9
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewStateEditVo.java
View File

@@ -2,21 +2,18 @@ package com.starry.admin.modules.clerk.module.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.time.LocalDateTime;
import lombok.Data;
/**
* @author admin
* 动态审核
* @author admin 动态审核
*/
@Data
@ApiModel(value = "店员资料审核状态修改参数", description = "修改店员资料审核状态的请求参数")
public class PlayClerkDataReviewStateEditVo {
@NotBlank(message = "ID不能为空")
@ApiModelProperty(value = "审核记录ID", required = true, example = "1", notes = "店员资料审核记录的ID")
private String id;

3
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelAddVo.java
View File

@@ -2,9 +2,8 @@ package com.starry.admin.modules.clerk.module.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import lombok.Data;
/**
* @author admin

4
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelEditVo.java
View File

@@ -2,9 +2,8 @@ package com.starry.admin.modules.clerk.module.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import lombok.Data;
/**
* @author admin
@@ -63,7 +62,6 @@ public class PlayClerkLevelEditVo {
@ApiModelProperty(value = "非首次随机单比例", example = "65", notes = "非首次随机单提成比例，范围0-100%")
private Integer notFirstRandomRadio;
@ApiModelProperty(value = "样式类型", example = "1", notes = "等级样式类型")
private Integer styleType;

2
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkLevelQueryReturnVo.java
View File

@@ -4,6 +4,7 @@ import lombok.Data;
/**
* 店员等级查询接口
*
* @author admin
*/
@Data
@@ -14,5 +15,4 @@ public class PlayClerkLevelQueryReturnVo {
*/
private String name;
}

4
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoAddVo.java
View File

@@ -2,9 +2,8 @@ package com.starry.admin.modules.clerk.module.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import lombok.Data;
/**
* @author admin
@@ -14,7 +13,6 @@ import javax.validation.constraints.NotNull;
@ApiModel(value = "店员分类添加参数", description = "新增店员分类信息的请求参数")
public class PlayClerkTypeInfoAddVo {
/**
* 分类名称
*/

1
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoQueryVo.java
View File

@@ -15,7 +15,6 @@ import lombok.EqualsAndHashCode;
@ApiModel(value = "店员分类查询参数", description = "查询店员分类信息的条件参数")
public class PlayClerkTypeInfoQueryVo extends BasePageEntity {
@ApiModelProperty(value = "分类ID", example = "1", notes = "店员分类的ID")
private String id;
}

2
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoReturnVo.java
View File

@@ -25,11 +25,9 @@ public class PlayClerkTypeInfoReturnVo {
*/
private Integer sort;
/**
* 店员数
*/
private Integer clerkNumber;
}

17
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUnsettledWagesInfoReturnVo.java
View File

@@ -2,10 +2,9 @@ package com.starry.admin.modules.clerk.module.vo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
import lombok.Data;
/**
* @author admin
@@ -16,58 +15,48 @@ public class PlayClerkUnsettledWagesInfoReturnVo {
private String clerkId;
private String clerkNickname;
@JsonIgnore
private List<PlayOrderInfoEntity> orderInfoEntities;
/**
* 待开始订单-数量
*/
private Integer orderState1Number;
/**
* 待开始订单-金额
*/
private BigDecimal orderState1Money;
/**
* 服务中订单-数量
*/
private Integer orderState2Number;
/**
* 服务中订单-金额
*/
private BigDecimal orderState2Money;
/**
* 服务中订单-店员收入
* 服务中订单-店员收入
*/
private BigDecimal orderState2Revenue;
/**
* 已完成未结算订单-数量
*/
private Integer orderState3Number;
/**
* 已完成未结算订单-金额
*/
private BigDecimal orderState3Money;
/**
* 已完成未结算订单-店员收入
* 已完成未结算订单-店员收入
*/
private BigDecimal orderState3Revenue;

8
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddToWxVo.java
View File

@@ -1,10 +1,8 @@
package com.starry.admin.modules.clerk.module.vo;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import lombok.Data;
/**
* @author admin
@@ -18,7 +16,6 @@ public class PlayClerkUserAddToWxVo {
@NotBlank(message = "昵称不能为空")
private String nickname;
/**
* 性别[0:未知;1:男;2:女]
*/
@@ -31,14 +28,12 @@ public class PlayClerkUserAddToWxVo {
@NotNull(message = "年龄不能为空")
private int age;
/**
* 微信号
*/
@NotBlank(message = "微信号不能为空")
private String weChat;
/**
* 手机号码区号
*/
@@ -57,7 +52,6 @@ public class PlayClerkUserAddToWxVo {
@NotBlank(message = "音频不能为空")
private String audioFrequency;
/**
* 所在国家
*/

6
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddVo.java
View File

@@ -1,10 +1,8 @@
package com.starry.admin.modules.clerk.module.vo;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import lombok.Data;
/**
* @author admin
@@ -94,11 +92,9 @@ public class PlayClerkUserAddVo {
@NotBlank(message = "城市不能为空")
private String city;
/**
* 备注
*/
private String remark;
}

5
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserEditVo.java
View File

@@ -2,11 +2,9 @@ package com.starry.admin.modules.clerk.module.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import lombok.Data;
/**
* @author admin
@@ -118,7 +116,6 @@ public class PlayClerkUserEditVo {
@ApiModelProperty(value = "所在城市", required = true, example = "深圳市")
private String city;
/**
* 备注
*/

7
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewQueryVo.java
View File

@@ -3,11 +3,10 @@ package com.starry.admin.modules.clerk.module.vo;
import com.starry.common.domain.BasePageEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* 店员申请审核
*
@@ -25,28 +24,24 @@ public class PlayClerkUserReviewQueryVo extends BasePageEntity {
@ApiModelProperty(value = "店员ID", example = "1", notes = "特定店员的ID")
private String clerkId;
/**
* 店员昵称
*/
@ApiModelProperty(value = "店员昵称", example = "小明", notes = "店员的昵称，支持模糊查询")
private String nickname;
/**
* 性别[0:未知;1:男;2:女]
*/
@ApiModelProperty(value = "性别", example = "1", notes = "0:未知;1:男;2:女")
private String sex;
/**
* 手机号码
*/
@ApiModelProperty(value = "手机号码", example = "13800138000", notes = "店员的手机号码")
private String phone;
/**
* 微信号
*/

5
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewReturnVo.java
View File

@@ -5,12 +5,11 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.starry.admin.common.conf.StringTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 店员申请审核

9
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewStateEditVo.java
View File

@@ -2,21 +2,18 @@ package com.starry.admin.modules.clerk.module.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.time.LocalDateTime;
import lombok.Data;
/**
* @author admin
* 动态审核
* @author admin 动态审核
*/
@Data
@ApiModel(value = "店员资料审核状态修改参数", description = "修改店员资料审核状态的请求参数")
public class PlayClerkUserReviewStateEditVo {
@NotBlank(message = "ID不能为空")
@ApiModelProperty(value = "审核记录ID", required = true, example = "1", notes = "店员资料审核记录的ID")
private String id;

7
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserStateEditVo.java
View File

@@ -2,10 +2,8 @@ package com.starry.admin.modules.clerk.module.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import lombok.Data;
/**
* @author admin
@@ -77,21 +75,18 @@ public class PlayClerkUserStateEditVo {
@ApiModelProperty(value = "是否固定等级", notes = "0:固定等级，1:不固定")
private String fixingLevel;
/**
* 在职状态（1：在职，0：离职）
*/
@ApiModelProperty(value = "在职状态", notes = "1：在职，0：离职", example = "1")
private String onboardingState = "1";
/**
* 在职状态（1：在职，0：离职）
*/
@ApiModelProperty(value = "店员等级ID")
private String levelId;
@ApiModelProperty(value = "备注", notes = "店员状态的备注信息")
private String remark;

10
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoReturnVo.java
View File

@@ -1,12 +1,11 @@
package com.starry.admin.modules.clerk.module.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
/**
* @author admin
@@ -30,13 +29,11 @@ public class PlayClerkWagesInfoReturnVo {
*/
private String clerkId;
/**
* 店员昵称
*/
private String clerkNickname;
/**
* 是否为往期统计(1:是;0:不是)
**/
@@ -66,7 +63,6 @@ public class PlayClerkWagesInfoReturnVo {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate endCountDate;
/**
* 结算时间
*/
@@ -74,7 +70,6 @@ public class PlayClerkWagesInfoReturnVo {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDateTime settlementDate;
/**
* 订单总数
*/
@@ -100,7 +95,6 @@ public class PlayClerkWagesInfoReturnVo {
*/
private Integer ordersExpiredNumber;
/**
* 店员收入
*/

24
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayAvatarFrameInfoService.java
View File

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.clerk.module.entity.PlayAvatarFrameInfoEntity;
import com.starry.admin.modules.clerk.module.vo.PlayAvatarFrameInfoQueryVo;
import java.util.List;
/**
@@ -17,12 +16,12 @@ public interface IPlayAvatarFrameInfoService extends IService<PlayAvatarFrameInf
/**
* 查询店员头像框
*
* @param id 店员头像框主键
* @param id
* 店员头像框主键
* @return 店员头像框
*/
PlayAvatarFrameInfoEntity selectPlayAvatarFrameInfoById(String id);
/**
* 查询店员头像框列表
*
@@ -30,11 +29,11 @@ public interface IPlayAvatarFrameInfoService extends IService<PlayAvatarFrameInf
*/
List<PlayAvatarFrameInfoEntity> selectAll();
/**
* 查询店员头像框列表
*
* @param vo 店员头像框
* @param vo
* 店员头像框
* @return 店员头像框集合
*/
IPage<PlayAvatarFrameInfoEntity> selectByPage(PlayAvatarFrameInfoQueryVo vo);
@@ -42,7 +41,8 @@ public interface IPlayAvatarFrameInfoService extends IService<PlayAvatarFrameInf
/**
* 查询店员头像框列表
*
* @param playAvatarFrameInfo 店员头像框
* @param playAvatarFrameInfo
* 店员头像框
* @return 店员头像框集合
*/
IPage<PlayAvatarFrameInfoEntity> selectPlayAvatarFrameInfoByPage(PlayAvatarFrameInfoEntity playAvatarFrameInfo);
@@ -50,7 +50,8 @@ public interface IPlayAvatarFrameInfoService extends IService<PlayAvatarFrameInf
/**
* 新增店员头像框
*
* @param playAvatarFrameInfo 店员头像框
* @param playAvatarFrameInfo
* 店员头像框
* @return 结果
*/
boolean create(PlayAvatarFrameInfoEntity playAvatarFrameInfo);
@@ -58,7 +59,8 @@ public interface IPlayAvatarFrameInfoService extends IService<PlayAvatarFrameInf
/**
* 修改店员头像框
*
* @param playAvatarFrameInfo 店员头像框
* @param playAvatarFrameInfo
* 店员头像框
* @return 结果
*/
boolean update(PlayAvatarFrameInfoEntity playAvatarFrameInfo);
@@ -66,7 +68,8 @@ public interface IPlayAvatarFrameInfoService extends IService<PlayAvatarFrameInf
/**
* 批量删除店员头像框
*
* @param ids 需要删除的店员头像框主键集合
* @param ids
* 需要删除的店员头像框主键集合
* @return 结果
*/
int deletePlayAvatarFrameInfoByIds(String[] ids);
@@ -74,7 +77,8 @@ public interface IPlayAvatarFrameInfoService extends IService<PlayAvatarFrameInf
/**
* 删除店员头像框信息
*
* @param id 店员头像框主键
* @param id
* 店员头像框主键
* @return 结果
*/
int deletePlayAvatarFrameInfoById(String id);

31
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkArticleInfoService.java
View File

@@ -8,7 +8,6 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkArticleReturnVo;
import com.starry.admin.modules.weichat.entity.article.PlayClerkArticleCustomQueryVo;
import com.starry.admin.modules.weichat.entity.article.PlayClerkArticleCustomReturnVo;
/**
* 店员动态信息Service接口
*
@@ -19,37 +18,40 @@ public interface IPlayClerkArticleInfoService extends IService<PlayClerkArticleI
/**
* 查询店员动态信息
*
* @param id 店员动态信息主键
* @param id
* 店员动态信息主键
* @return 店员动态信息
*/
PlayClerkArticleInfoEntity selectPlayClerkArticleInfoById(String id);
/**
* 查询店员动态信息列表
*
* @param vo 店员动态信息查询对象
* @param searchByYourself 查询人是否是自己
* @param vo
* 店员动态信息查询对象
* @param searchByYourself
* 查询人是否是自己
*
* @return 店员动态信息集合
*/
IPage<PlayClerkArticleReturnVo> selectByPage(PlayClerkArticleQueryVo vo, boolean searchByYourself);
/**
* 顾客查询动态列表
*
* @param customId 顾客ID
* @param customId 动态查询对象
* @param customId
* 顾客ID
* @param customId
* 动态查询对象
* @return PlayClerkArticleCustomReturnVo
*/
IPage<PlayClerkArticleCustomReturnVo> customSelectByPage(PlayClerkArticleCustomQueryVo vo, String customId);
/**
* 新增店员动态信息
*
* @param playClerkArticleInfo 店员动态信息
* @param playClerkArticleInfo
* 店员动态信息
* @return 结果
*/
boolean create(PlayClerkArticleInfoEntity playClerkArticleInfo);
@@ -57,7 +59,8 @@ public interface IPlayClerkArticleInfoService extends IService<PlayClerkArticleI
/**
* 修改店员动态信息
*
* @param playClerkArticleInfo 店员动态信息
* @param playClerkArticleInfo
* 店员动态信息
* @return 结果
*/
boolean update(PlayClerkArticleInfoEntity playClerkArticleInfo);
@@ -65,7 +68,8 @@ public interface IPlayClerkArticleInfoService extends IService<PlayClerkArticleI
/**
* 批量删除店员动态信息
*
* @param ids 需要删除的店员动态信息主键集合
* @param ids
* 需要删除的店员动态信息主键集合
* @return 结果
*/
int deletePlayClerkArticleInfoByIds(String[] ids);
@@ -73,7 +77,8 @@ public interface IPlayClerkArticleInfoService extends IService<PlayClerkArticleI
/**
* 删除店员动态信息信息
*
* @param id 店员动态信息主键
* @param id
* 店员动态信息主键
* @return 结果
*/
int deletePlayClerkArticleInfoById(String id);

23
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkClassificationInfoService.java
View File

@@ -3,7 +3,6 @@ package com.starry.admin.modules.clerk.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.clerk.module.entity.PlayClerkClassificationInfoEntity;
import java.util.List;
/**
@@ -16,7 +15,8 @@ public interface IPlayClerkClassificationInfoService extends IService<PlayClerkC
/**
* 查询店员分类
*
* @param id 店员分类主键
* @param id
* 店员分类主键
* @return 店员分类
*/
PlayClerkClassificationInfoEntity selectPlayClerkClassificationInfoById(String id);
@@ -28,19 +28,21 @@ public interface IPlayClerkClassificationInfoService extends IService<PlayClerkC
*/
List<PlayClerkClassificationInfoEntity> selectAll();
/**
* 查询店员分类列表
*
* @param playClerkClassificationInfo 店员分类
* @param playClerkClassificationInfo
* 店员分类
* @return 店员分类集合
*/
IPage<PlayClerkClassificationInfoEntity> selectPlayClerkClassificationInfoByPage(PlayClerkClassificationInfoEntity playClerkClassificationInfo);
IPage<PlayClerkClassificationInfoEntity> selectPlayClerkClassificationInfoByPage(
PlayClerkClassificationInfoEntity playClerkClassificationInfo);
/**
* 新增店员分类
*
* @param playClerkClassificationInfo 店员分类
* @param playClerkClassificationInfo
* 店员分类
* @return 结果
*/
boolean create(PlayClerkClassificationInfoEntity playClerkClassificationInfo);
@@ -48,7 +50,8 @@ public interface IPlayClerkClassificationInfoService extends IService<PlayClerkC
/**
* 修改店员分类
*
* @param playClerkClassificationInfo 店员分类
* @param playClerkClassificationInfo
* 店员分类
* @return 结果
*/
boolean update(PlayClerkClassificationInfoEntity playClerkClassificationInfo);
@@ -56,7 +59,8 @@ public interface IPlayClerkClassificationInfoService extends IService<PlayClerkC
/**
* 批量删除店员分类
*
* @param ids 需要删除的店员分类主键集合
* @param ids
* 需要删除的店员分类主键集合
* @return 结果
*/
int deletePlayClerkClassificationInfoByIds(String[] ids);
@@ -64,7 +68,8 @@ public interface IPlayClerkClassificationInfoService extends IService<PlayClerkC
/**
* 删除店员分类信息
*
* @param id 店员分类主键
* @param id
* 店员分类主键
* @return 结果
*/
int deletePlayClerkClassificationInfoById(String id);

54
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkCommodityService.java
View File

@@ -3,7 +3,6 @@ package com.starry.admin.modules.clerk.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.clerk.module.entity.PlayClerkCommodityEntity;
import java.util.List;
/**
@@ -14,29 +13,32 @@ import java.util.List;
*/
public interface IPlayClerkCommodityService extends IService<PlayClerkCommodityEntity> {
/**
* 初始化当前陪聊服务项目
*
* @param playUserId 账号ID
* @param playUserId
* 账号ID
*/
void initClerkCommodity(String playUserId);
/**
* 根据用户ID，查询当前用户的服务项目类型
*
* @param userId 用户ID
* @param enablingState 服务启动状态[0:停用;1:启用]
* @param userId
* 用户ID
* @param enablingState
* 服务启动状态[0:停用;1:启用]
* @return 服务项目类型
*/
List<String> getClerkCommodityList(String userId,String enablingState);
List<String> getClerkCommodityList(String userId, String enablingState);
/**
* 根据用户ID，查询当前店员所有服务项目
*
* @param userId 用户ID
* @param enablingState 服务启动状态[0:停用;1:启用]
* @param userId
* 用户ID
* @param enablingState
* 服务启动状态[0:停用;1:启用]
* @return List<PlayClerkCommodityEntity>
*/
List<PlayClerkCommodityEntity> selectCommodityTypeByUser(String userId, String enablingState);
@@ -44,11 +46,12 @@ public interface IPlayClerkCommodityService extends IService<PlayClerkCommodityE
/**
* 根据用户ID，查询当前用户的服务项目
*
* @param playUserId 用户ID
* @param playUserId
* 用户ID
* @return List<PlayClerkCommodityEntity>
*/
List<PlayClerkCommodityEntity> selectByUser(String playUserId);
/**
* 查询当前陪聊所有服务项目
*
@@ -56,21 +59,23 @@ public interface IPlayClerkCommodityService extends IService<PlayClerkCommodityE
*/
List<PlayClerkCommodityEntity> selectAll();
/**
* 启停当前陪聊服务项目
*
* @param type 项目名称
* @param enablingState 启停状态
* @param clerkUserId 陪聊ID
* @param type
* 项目名称
* @param enablingState
* 启停状态
* @param clerkUserId
* 陪聊ID
*/
void startStopClerkItem(String type, String enablingState, String clerkUserId);
/**
* 查询陪聊服务项目
*
* @param id 陪聊服务项目主键
* @param id
* 陪聊服务项目主键
* @return 陪聊服务项目
*/
PlayClerkCommodityEntity selectPlayClerkCommodityById(String id);
@@ -78,7 +83,8 @@ public interface IPlayClerkCommodityService extends IService<PlayClerkCommodityE
/**
* 查询陪聊服务项目列表
*
* @param playClerkCommodity 陪聊服务项目
* @param playClerkCommodity
* 陪聊服务项目
* @return 陪聊服务项目集合
*/
IPage<PlayClerkCommodityEntity> selectPlayClerkCommodityByPage(PlayClerkCommodityEntity playClerkCommodity);
@@ -86,7 +92,8 @@ public interface IPlayClerkCommodityService extends IService<PlayClerkCommodityE
/**
* 新增陪聊服务项目
*
* @param playClerkCommodity 陪聊服务项目
* @param playClerkCommodity
* 陪聊服务项目
* @return 结果
*/
boolean create(PlayClerkCommodityEntity playClerkCommodity);
@@ -94,7 +101,8 @@ public interface IPlayClerkCommodityService extends IService<PlayClerkCommodityE
/**
* 修改陪聊服务项目
*
* @param playClerkCommodity 陪聊服务项目
* @param playClerkCommodity
* 陪聊服务项目
* @return 结果
*/
boolean update(PlayClerkCommodityEntity playClerkCommodity);
@@ -102,7 +110,8 @@ public interface IPlayClerkCommodityService extends IService<PlayClerkCommodityE
/**
* 批量删除陪聊服务项目
*
* @param ids 需要删除的陪聊服务项目主键集合
* @param ids
* 需要删除的陪聊服务项目主键集合
* @return 结果
*/
int deletePlayClerkCommodityByIds(String[] ids);
@@ -110,7 +119,8 @@ public interface IPlayClerkCommodityService extends IService<PlayClerkCommodityE
/**
* 删除陪聊服务项目信息
*
* @param id 陪聊服务项目主键
* @param id
* 陪聊服务项目主键
* @return 结果
*/
int deletePlayClerkCommodityById(String id);

42
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkDataReviewInfoService.java
View File

@@ -6,7 +6,6 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkDataReviewInfoEntit
import com.starry.admin.modules.clerk.module.vo.PlayClerkDataReviewQueryVo;
import com.starry.admin.modules.clerk.module.vo.PlayClerkDataReviewReturnVo;
import com.starry.admin.modules.clerk.module.vo.PlayClerkDataReviewStateEditVo;
import java.util.List;
/**
@@ -18,7 +17,9 @@ import java.util.List;
public interface IPlayClerkDataReviewInfoService extends IService<PlayClerkDataReviewInfoEntity> {
/**
* 查询店员资料审核
* @param id 店员资料审核主键
*
* @param id
* 店员资料审核主键
* @return 店员资料审核
*/
PlayClerkDataReviewInfoEntity selectPlayClerkDataReviewInfoById(String id);
@@ -26,31 +27,41 @@ public interface IPlayClerkDataReviewInfoService extends IService<PlayClerkDataR
/**
* 查询店员资料申请
*
* @param clerkId 店员ID
* @param reviewState 审核状态（0：未审核:1：审核通过，2：审核不通过）
* @param clerkId
* 店员ID
* @param reviewState
* 审核状态（0：未审核:1：审核通过，2：审核不通过）
* @return PlayClerkDataReviewInfoEntity
*/
List<PlayClerkDataReviewInfoEntity> queryByClerkId(String clerkId, String reviewState);
/**
* 查询店员资料申请
* @param clerkId 店员ID
* @param dataType 资料类型[0:昵称;1:头像;2:相册;3:录音]
* @param reviewState 审核状态（0：未审核:1：审核通过，2：审核不通过）
*
* @param clerkId
* 店员ID
* @param dataType
* 资料类型[0:昵称;1:头像;2:相册;3:录音]
* @param reviewState
* 审核状态（0：未审核:1：审核通过，2：审核不通过）
* @return PlayClerkDataReviewInfoEntity
*/
PlayClerkDataReviewInfoEntity queryByClerkId(String clerkId, String dataType, String reviewState);
/**
* 查询店员资料审核列表
* @param vo 店员资料审核
*
* @param vo
* 店员资料审核
* @return 店员资料审核集合
*/
IPage<PlayClerkDataReviewReturnVo> selectByPage(PlayClerkDataReviewQueryVo vo);
/**
* 新增店员资料审核
* @param playClerkDataReviewInfo 店员资料审核
*
* @param playClerkDataReviewInfo
* 店员资料审核
* @return 结果
*/
boolean create(PlayClerkDataReviewInfoEntity playClerkDataReviewInfo);
@@ -58,12 +69,15 @@ public interface IPlayClerkDataReviewInfoService extends IService<PlayClerkDataR
/**
* 修改店员资料审核状态
*
* @param vo PlayClerkDataReviewStateEditVo
* @param vo
* PlayClerkDataReviewStateEditVo
*/
void updateDataReviewState(PlayClerkDataReviewStateEditVo vo);
/**
* 修改店员资料审核
* @param playClerkDataReviewInfo 店员资料审核
*
* @param playClerkDataReviewInfo
* 店员资料审核
* @return 结果
*/
boolean update(PlayClerkDataReviewInfoEntity playClerkDataReviewInfo);
@@ -71,7 +85,8 @@ public interface IPlayClerkDataReviewInfoService extends IService<PlayClerkDataR
/**
* 批量删除店员资料审核
*
* @param ids 需要删除的店员资料审核主键集合
* @param ids
* 需要删除的店员资料审核主键集合
* @return 结果
*/
int deletePlayClerkDataReviewInfoByIds(String[] ids);
@@ -79,7 +94,8 @@ public interface IPlayClerkDataReviewInfoService extends IService<PlayClerkDataR
/**
* 删除店员资料审核信息
*
* @param id 店员资料审核主键
* @param id
* 店员资料审核主键
* @return 结果
*/
int deletePlayClerkDataReviewInfoById(String id);

24
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkLevelInfoService.java
View File

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity;
import com.starry.admin.modules.system.module.entity.SysTenantEntity;
import java.util.List;
/**
@@ -18,7 +17,8 @@ public interface IPlayClerkLevelInfoService extends IService<PlayClerkLevelInfoE
/**
* 初始化店员等级
*
* @param sysTenantEntity 租户信息
* @param sysTenantEntity
* 租户信息
* @author admin
* @since 2024/7/19 15:13
**/
@@ -34,7 +34,8 @@ public interface IPlayClerkLevelInfoService extends IService<PlayClerkLevelInfoE
/**
* 查询店员等级
*
* @param id 店员等级主键
* @param id
* 店员等级主键
* @return 店员等级
*/
PlayClerkLevelInfoEntity selectPlayClerkLevelInfoById(String id);
@@ -49,7 +50,8 @@ public interface IPlayClerkLevelInfoService extends IService<PlayClerkLevelInfoE
/**
* 分页查询店员等级列表
*
* @param playClerkLevelInfo 店员等级
* @param playClerkLevelInfo
* 店员等级
* @return 店员等级集合
*/
IPage<PlayClerkLevelInfoEntity> selectPlayClerkLevelInfoByPage(PlayClerkLevelInfoEntity playClerkLevelInfo);
@@ -57,7 +59,8 @@ public interface IPlayClerkLevelInfoService extends IService<PlayClerkLevelInfoE
/**
* 新增店员等级
*
* @param playClerkLevelInfo 店员等级
* @param playClerkLevelInfo
* 店员等级
* @return 结果
*/
boolean create(PlayClerkLevelInfoEntity playClerkLevelInfo);
@@ -65,7 +68,8 @@ public interface IPlayClerkLevelInfoService extends IService<PlayClerkLevelInfoE
/**
* 修改店员等级
*
* @param playClerkLevelInfo 店员等级
* @param playClerkLevelInfo
* 店员等级
* @return 结果
*/
boolean update(PlayClerkLevelInfoEntity playClerkLevelInfo);
@@ -73,7 +77,8 @@ public interface IPlayClerkLevelInfoService extends IService<PlayClerkLevelInfoE
/**
* 批量删除店员等级
*
* @param ids 需要删除的店员等级主键集合
* @param ids
* 需要删除的店员等级主键集合
* @return 结果
*/
int deletePlayClerkLevelInfoByIds(String[] ids);
@@ -81,12 +86,12 @@ public interface IPlayClerkLevelInfoService extends IService<PlayClerkLevelInfoE
/**
* 删除店员等级信息
*
* @param id 店员等级主键
* @param id
* 店员等级主键
* @return 结果
*/
int deletePlayClerkLevelInfoById(String id);
/**
* 查询最大等级
*
@@ -94,7 +99,6 @@ public interface IPlayClerkLevelInfoService extends IService<PlayClerkLevelInfoE
*/
int selectMaxLevel();
/**
* 删除最大等级
*/

26
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkPkService.java
View File

@@ -8,33 +8,41 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkPkEntity;
* 店员pkService接口
*
* @author admin
* @since 2024-08-02
* @since 2024-08-02
*/
public interface IPlayClerkPkService extends IService<PlayClerkPkEntity> {
/**
* 查询店员pk
* @param id 店员pk主键
*
* @param id
* 店员pk主键
* @return 店员pk
*/
PlayClerkPkEntity selectPlayClerkPkById(String id);
PlayClerkPkEntity selectPlayClerkPkById(String id);
/**
* 查询店员pk列表
* @param playClerkPk 店员pk
*
* @param playClerkPk
* 店员pk
* @return 店员pk集合
*/
IPage<PlayClerkPkEntity> selectPlayClerkPkByPage(PlayClerkPkEntity playClerkPk);
/**
* 新增店员pk
* @param playClerkPk 店员pk
*
* @param playClerkPk
* 店员pk
* @return 结果
*/
boolean create(PlayClerkPkEntity playClerkPk);
/**
* 修改店员pk
* @param playClerkPk 店员pk
*
* @param playClerkPk
* 店员pk
* @return 结果
*/
boolean update(PlayClerkPkEntity playClerkPk);
@@ -42,7 +50,8 @@ public interface IPlayClerkPkService extends IService<PlayClerkPkEntity> {
/**
* 批量删除店员pk
*
* @param ids 需要删除的店员pk主键集合
* @param ids
* 需要删除的店员pk主键集合
* @return 结果
*/
int deletePlayClerkPkByIds(String[] ids);
@@ -50,7 +59,8 @@ public interface IPlayClerkPkService extends IService<PlayClerkPkEntity> {
/**
* 删除店员pk信息
*
* @param id 店员pk主键
* @param id
* 店员pk主键
* @return 结果
*/
int deletePlayClerkPkById(String id);

54
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkRankingInfoService.java
View File

@@ -7,7 +7,6 @@ import com.starry.admin.modules.clerk.module.entity.IPlayClerkRankingInfoReturnV
import com.starry.admin.modules.clerk.module.entity.PlayClerkRankingInfoEntity;
import com.starry.admin.modules.weichat.entity.order.PlayOrderHistoryRankingReturnVo;
import com.starry.admin.modules.weichat.entity.order.PlayOrderRankingReturnVo;
import java.time.LocalDate;
import java.util.List;
@@ -19,11 +18,11 @@ import java.util.List;
*/
public interface IPlayClerkRankingInfoService extends IService<PlayClerkRankingInfoEntity> {
/**
* 分页查询店员排行
*
* @param vo 店员排行查询对象
* @param vo
* 店员排行查询对象
* @return 店员排查询对象
*/
IPage<IPlayClerkRankingInfoReturnVo> selectByPage(IPlayClerkRankingInfoQueryVo vo);
@@ -31,7 +30,8 @@ public interface IPlayClerkRankingInfoService extends IService<PlayClerkRankingI
/**
* 查询店员排行
*
* @param id 店员排行主键
* @param id
* 店员排行主键
* @return 店员排行
*/
PlayClerkRankingInfoEntity selectPlayClerkRankingInfoById(String id);
@@ -39,17 +39,19 @@ public interface IPlayClerkRankingInfoService extends IService<PlayClerkRankingI
/**
* 查询店员排行列表
*
* @param playClerkRankingInfo 店员排行
* @param playClerkRankingInfo
* 店员排行
* @return 店员排行集合
*/
IPage<PlayClerkRankingInfoEntity> selectPlayClerkRankingInfoByPage(PlayClerkRankingInfoEntity playClerkRankingInfo);
/**
* 根据统计批次更新排名数据
*
* @param weeklyRanking 日排名还是周排名（0:每日排名;1:每周排名）
* @param serialNumber 统计批次
* @param weeklyRanking
* 日排名还是周排名（0:每日排名;1:每周排名）
* @param serialNumber
* 统计批次
* @author admin
* @since 2024/6/12 15:47
**/
@@ -58,18 +60,19 @@ public interface IPlayClerkRankingInfoService extends IService<PlayClerkRankingI
/**
* 查询当前排行榜最后一个批次值
*
* @param weeklyRanking 日排名还是周排名（0:每日排名;1:每周排名）
* @param weeklyRanking
* 日排名还是周排名（0:每日排名;1:每周排名）
* @return Integer 当前排行榜最后一个批次值
* @author admin
* @since 2024/6/7 11:53
**/
Integer selectSerialNumber(String weeklyRanking);
/**
* 查询当前排行榜最大批次
*
* @param weeklyRanking 日排名还是周排名（0:每日排名;1:每周排名）
* @param weeklyRanking
* 日排名还是周排名（0:每日排名;1:每周排名）
* @return List<com.starry.admin.modules.clerk.module.entity.PlayClerkRankingInfoEntity>
* @author admin
* @since 2024/6/7 11:55
@@ -79,18 +82,21 @@ public interface IPlayClerkRankingInfoService extends IService<PlayClerkRankingI
/**
* 根据时间查询店员排行
*
* @param clerkId 店员ID
* @param startTime 开始时间
* @param endTime 结束时间
* @param clerkId
* 店员ID
* @param startTime
* 开始时间
* @param endTime
* 结束时间
* @return 店员排行集合
*/
PlayClerkRankingInfoEntity selectByTime(String clerkId, LocalDate startTime, LocalDate endTime);
/**
* 店员分页查询本期排行信息
*
* @param clerkId 店员ID
* @param clerkId
* 店员ID
* @return 店员排行集合
*/
PlayOrderRankingReturnVo selectCurrentRanking(String clerkId);
@@ -98,16 +104,17 @@ public interface IPlayClerkRankingInfoService extends IService<PlayClerkRankingI
/**
* 店员分页查询本期历史排行
*
* @param clerkId 店员ID
* @param clerkId
* 店员ID
* @return 店员排行集合
*/
List<PlayOrderHistoryRankingReturnVo> selectHistoryRanking(String clerkId);
/**
* 新增店员排行
*
* @param playClerkRankingInfo 店员排行
* @param playClerkRankingInfo
* 店员排行
* @return 结果
*/
boolean create(PlayClerkRankingInfoEntity playClerkRankingInfo);
@@ -115,7 +122,8 @@ public interface IPlayClerkRankingInfoService extends IService<PlayClerkRankingI
/**
* 修改店员排行
*
* @param playClerkRankingInfo 店员排行
* @param playClerkRankingInfo
* 店员排行
* @return 结果
*/
boolean update(PlayClerkRankingInfoEntity playClerkRankingInfo);
@@ -123,7 +131,8 @@ public interface IPlayClerkRankingInfoService extends IService<PlayClerkRankingI
/**
* 批量删除店员排行
*
* @param ids 需要删除的店员排行主键集合
* @param ids
* 需要删除的店员排行主键集合
* @return 结果
*/
int deletePlayClerkRankingInfoByIds(String[] ids);
@@ -131,7 +140,8 @@ public interface IPlayClerkRankingInfoService extends IService<PlayClerkRankingI
/**
* 删除店员排行信息
*
* @param id 店员排行主键
* @param id
* 店员排行主键
* @return 结果
*/
int deletePlayClerkRankingInfoById(String id);

22
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkTypeInfoService.java
View File

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeInfoEntity;
import com.starry.admin.modules.clerk.module.vo.PlayClerkTypeInfoQueryVo;
import com.starry.admin.modules.clerk.module.vo.PlayClerkTypeInfoReturnVo;
import java.util.List;
/**
@@ -18,7 +17,8 @@ public interface IPlayClerkTypeInfoService extends IService<PlayClerkTypeInfoEnt
/**
* 查询店员分类信息
*
* @param id 店员分类信息主键
* @param id
* 店员分类信息主键
* @return 店员分类信息
*/
PlayClerkTypeInfoEntity selectPlayClerkTypeInfoById(String id);
@@ -30,19 +30,20 @@ public interface IPlayClerkTypeInfoService extends IService<PlayClerkTypeInfoEnt
*/
List<PlayClerkTypeInfoEntity> selectByAll();
/**
* 查询店员分类信息列表
* @param vo 店员分类信息
*
* @param vo
* 店员分类信息
* @return 店员分类信息集合
*/
IPage<PlayClerkTypeInfoReturnVo> selectByPage(PlayClerkTypeInfoQueryVo vo);
/**
* 新增店员分类信息
*
* @param playClerkTypeInfo 店员分类信息
* @param playClerkTypeInfo
* 店员分类信息
* @return 结果
*/
boolean create(PlayClerkTypeInfoEntity playClerkTypeInfo);
@@ -50,7 +51,8 @@ public interface IPlayClerkTypeInfoService extends IService<PlayClerkTypeInfoEnt
/**
* 修改店员分类信息
*
* @param playClerkTypeInfo 店员分类信息
* @param playClerkTypeInfo
* 店员分类信息
* @return 结果
*/
boolean update(PlayClerkTypeInfoEntity playClerkTypeInfo);
@@ -58,7 +60,8 @@ public interface IPlayClerkTypeInfoService extends IService<PlayClerkTypeInfoEnt
/**
* 批量删除店员分类信息
*
* @param ids 需要删除的店员分类信息主键集合
* @param ids
* 需要删除的店员分类信息主键集合
* @return 结果
*/
int deletePlayClerkTypeInfoByIds(String[] ids);
@@ -66,7 +69,8 @@ public interface IPlayClerkTypeInfoService extends IService<PlayClerkTypeInfoEnt
/**
* 删除店员分类信息信息
*
* @param id 店员分类信息主键
* @param id
* 店员分类信息主键
* @return 结果
*/
int deletePlayClerkTypeInfoById(String id);

21
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkTypeUserInfoService.java
View File

@@ -14,7 +14,8 @@ public interface IPlayClerkTypeUserInfoService extends IService<PlayClerkTypeUse
/**
* 查询店员和分类关系
*
* @param id 店员和分类关系主键
* @param id
* 店员和分类关系主键
* @return 店员和分类关系
*/
PlayClerkTypeUserInfoEntity selectPlayClerkTypeUserInfoById(String id);
@@ -22,15 +23,18 @@ public interface IPlayClerkTypeUserInfoService extends IService<PlayClerkTypeUse
/**
* 查询店员和分类关系列表
*
* @param playClerkTypeUserInfo 店员和分类关系
* @param playClerkTypeUserInfo
* 店员和分类关系
* @return 店员和分类关系集合
*/
IPage<PlayClerkTypeUserInfoEntity> selectPlayClerkTypeUserInfoByPage(PlayClerkTypeUserInfoEntity playClerkTypeUserInfo);
IPage<PlayClerkTypeUserInfoEntity> selectPlayClerkTypeUserInfoByPage(
PlayClerkTypeUserInfoEntity playClerkTypeUserInfo);
/**
* 新增店员和分类关系
*
* @param playClerkTypeUserInfo 店员和分类关系
* @param playClerkTypeUserInfo
* 店员和分类关系
* @return 结果
*/
boolean create(PlayClerkTypeUserInfoEntity playClerkTypeUserInfo);
@@ -38,7 +42,8 @@ public interface IPlayClerkTypeUserInfoService extends IService<PlayClerkTypeUse
/**
* 修改店员和分类关系
*
* @param playClerkTypeUserInfo 店员和分类关系
* @param playClerkTypeUserInfo
* 店员和分类关系
* @return 结果
*/
boolean update(PlayClerkTypeUserInfoEntity playClerkTypeUserInfo);
@@ -46,7 +51,8 @@ public interface IPlayClerkTypeUserInfoService extends IService<PlayClerkTypeUse
/**
* 批量删除店员和分类关系
*
* @param ids 需要删除的店员和分类关系主键集合
* @param ids
* 需要删除的店员和分类关系主键集合
* @return 结果
*/
int deletePlayClerkTypeUserInfoByIds(String[] ids);
@@ -54,7 +60,8 @@ public interface IPlayClerkTypeUserInfoService extends IService<PlayClerkTypeUse
/**
* 删除店员和分类关系信息
*
* @param id 店员和分类关系主键
* @param id
* 店员和分类关系主键
* @return 结果
*/
int deletePlayClerkTypeUserInfoById(String id);

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

@@ -13,11 +13,9 @@ import com.starry.admin.modules.statistics.module.vo.PlayClerkPerformanceInfoQue
import com.starry.admin.modules.weichat.entity.PlayClerkUserLoginResponseVo;
import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoQueryVo;
import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoResultVo;
import java.math.BigDecimal;
import java.util.List;
/**
* 店员Service接口
*
@@ -26,11 +24,11 @@ import java.util.List;
*/
public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEntity> {
/**
* 根据分组ID查询店员列表
*
* @param typeId 分类ID
* @param typeId
* 分类ID
* @return 店员列表
*/
List<PlayClerkUserInfoEntity> listAllByTypeId(String typeId);
@@ -38,7 +36,8 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 根据分组ID查询店员列表
*
* @param groupId 分组ID
* @param groupId
* 分组ID
* @return 店员列表
*/
List<PlayClerkUserInfoEntity> listAllByGroupId(String groupId);
@@ -46,7 +45,8 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 查询当前租户店员总数
*
* @param tenantId 租户ID
* @param tenantId
* 租户ID
* @return 店员总数
*/
Long getTotalClerkUser(String tenantId);
@@ -54,7 +54,8 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 获取当前店员抽成信息
*
* @param clerkId 店员ID
* @param clerkId
* 店员ID
* @return com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity
* @author admin
* @since 2024/6/3 11:29
@@ -64,7 +65,8 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 查询店员
*
* @param openId 微信ID
* @param openId
* 微信ID
* @return 店员
*/
PlayClerkUserInfoEntity selectByOpenid(String openId);
@@ -72,7 +74,8 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 查询店员
*
* @param id 店员主键
* @param id
* 店员主键
* @return 店员
*/
PlayClerkUserInfoEntity selectById(String id);
@@ -80,7 +83,8 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 获得陪聊用户登录返回信息
*
* @param vo PlayClerkUserInfoEntity
* @param vo
* PlayClerkUserInfoEntity
* @return PlayClerkUserLoginResponseVo
*/
PlayClerkUserLoginResponseVo getVo(PlayClerkUserInfoEntity vo);
@@ -88,8 +92,10 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 更新token
*
* @param id 用户ID
* @param token token
* @param id
* 用户ID
* @param token
* token
* @author admin
* @since 2024/4/9 14:30
**/
@@ -98,8 +104,10 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 更新账号余额
*
* @param id 用户ID
* @param accountBalance 账户余额
* @param id
* 用户ID
* @param accountBalance
* 账户余额
* @author admin
* @since 2024/4/9 14:33
**/
@@ -108,16 +116,23 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 更新店员账户余额信息
*
* @param userId 用户ID
* @param balanceBeforeOperation 操作前余额
* @param balanceAfterOperation 操作后余额
* @param operationType 操作类型（0:充值;1:消费;2:服务）
* @param operationAction 操作动作
* @param balanceMoney 操作金额
* @param orderId 订单ID
* @param userId
* 用户ID
* @param balanceBeforeOperation
* 操作前余额
* @param balanceAfterOperation
* 操作后余额
* @param operationType
* 操作类型（0:充值;1:消费;2:服务）
* @param operationAction
* 操作动作
* @param balanceMoney
* 操作金额
* @param orderId
* 订单ID
*/
void updateAccountBalanceById(String userId, BigDecimal balanceBeforeOperation, BigDecimal balanceAfterOperation, String operationType, String operationAction, BigDecimal balanceMoney, String orderId);
void updateAccountBalanceById(String userId, BigDecimal balanceBeforeOperation, BigDecimal balanceAfterOperation,
String operationType, String operationAction, BigDecimal balanceMoney, String orderId);
/**
* 查询当前租户下所有店员
@@ -129,26 +144,27 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 查询店员未结算订单
*
* @param vo 未结算订单查询对象
* @param vo
* 未结算订单查询对象
* @return 未结算订单
*/
IPage<PlayClerkUnsettledWagesInfoReturnVo> listUnsettledWagesByPage(PlayClerkUnsettledWagesInfoQueryVo vo);
/**
* 管理端分页查询店员信息
*
* @param vo 店员查询实体
* @param vo
* 店员查询实体
* @return 店员列表
*/
IPage<PlayClerkUserInfoEntity> selectByPage(PlayClerkPerformanceInfoQueryVo vo);
/**
* 管理端分页查询店员信息
*
* @param vo 店员查询实体
* @param vo
* 店员查询实体
* @return 店员列表
*/
@@ -157,8 +173,10 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 查询店员列表
*
* @param vo 店员查询对象
* @param customUserId 顾客ID
* @param vo
* 店员查询对象
* @param customUserId
* 顾客ID
* @return 店员列表
*/
IPage<PlayClerkUserInfoResultVo> selectByPage(PlayClerkUserInfoQueryVo vo, String customUserId);
@@ -166,7 +184,8 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 查询店员列表
*
* @param vo 店员查询对象
* @param vo
* 店员查询对象
* @return 店员集合
*/
IPage<PlayClerkUserInfoResultVo> selectPlayClerkUserInfoByPage(PlayClerkUserInfoQueryVo vo);
@@ -174,7 +193,8 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 新增店员
*
* @param playClerkUserInfo 店员
* @param playClerkUserInfo
* 店员
* @return 结果
*/
boolean create(PlayClerkUserInfoEntity playClerkUserInfo);
@@ -182,7 +202,8 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 修改店员
*
* @param playClerkUserInfo 店员
* @param playClerkUserInfo
* 店员
* @return 结果
*/
boolean update(PlayClerkUserInfoEntity playClerkUserInfo);
@@ -190,7 +211,8 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 批量删除店员
*
* @param ids 需要删除的店员主键集合
* @param ids
* 需要删除的店员主键集合
* @return 结果
*/
int deletePlayClerkUserInfoByIds(String[] ids);
@@ -198,7 +220,8 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
/**
* 删除店员信息
*
* @param id 店员主键
* @param id
* 店员主键
* @return 结果
*/
int deletePlayClerkUserInfoById(String id);

32
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserReviewInfoService.java
View File

@@ -17,26 +17,28 @@ public interface IPlayClerkUserReviewInfoService extends IService<PlayClerkUserR
/**
* 查询店员资料审核
*
* @param id 店员资料审核主键
* @param id
* 店员资料审核主键
* @return 店员资料审核
*/
PlayClerkUserReviewInfoEntity selectPlayClerkUserReviewInfoById(String id);
/**
* 根据店员ID，查询未审核的申请
*
* @param clerkId 店员ID
* @param reviewState 审核状态（0：未审核:1：审核通过，2：审核不通过）
* @param clerkId
* 店员ID
* @param reviewState
* 审核状态（0：未审核:1：审核通过，2：审核不通过）
* @return 店员申请审核对象
*/
PlayClerkUserReviewInfoEntity queryByClerkId(String clerkId, String reviewState);
/**
* 分页查询店员申请
*
* @param vo 店员申请对象
* @param vo
* 店员申请对象
* @return 店员申请对象
*/
IPage<PlayClerkUserReviewReturnVo> selectByPage(PlayClerkUserReviewQueryVo vo);
@@ -44,15 +46,18 @@ public interface IPlayClerkUserReviewInfoService extends IService<PlayClerkUserR
/**
* 查询店员资料审核列表
*
* @param playClerkUserReviewInfo 店员资料审核
* @param playClerkUserReviewInfo
* 店员资料审核
* @return 店员资料审核集合
*/
IPage<PlayClerkUserReviewInfoEntity> selectPlayClerkUserReviewInfoByPage(PlayClerkUserReviewInfoEntity playClerkUserReviewInfo);
IPage<PlayClerkUserReviewInfoEntity> selectPlayClerkUserReviewInfoByPage(
PlayClerkUserReviewInfoEntity playClerkUserReviewInfo);
/**
* 新增店员资料审核
*
* @param playClerkUserReviewInfo 店员资料审核
* @param playClerkUserReviewInfo
* 店员资料审核
* @return 结果
*/
boolean create(PlayClerkUserReviewInfoEntity playClerkUserReviewInfo);
@@ -62,14 +67,16 @@ public interface IPlayClerkUserReviewInfoService extends IService<PlayClerkUserR
/**
* 修改店员资料审核
*
* @param vo 店员资料审核对象
* @param vo
* 店员资料审核对象
*/
void updateDataReviewState(PlayClerkUserReviewStateEditVo vo);
/**
* 批量删除店员资料审核
*
* @param ids 需要删除的店员资料审核主键集合
* @param ids
* 需要删除的店员资料审核主键集合
* @return 结果
*/
int deletePlayClerkUserReviewInfoByIds(String[] ids);
@@ -77,7 +84,8 @@ public interface IPlayClerkUserReviewInfoService extends IService<PlayClerkUserR
/**
* 删除店员资料审核信息
*
* @param id 店员资料审核主键
* @param id
* 店员资料审核主键
* @return 结果
*/
int deletePlayClerkUserReviewInfoById(String id);

35
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkWagesDetailsInfoService.java
View File

@@ -3,7 +3,6 @@ package com.starry.admin.modules.clerk.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesDetailsInfoEntity;
import java.util.List;
/**
@@ -17,16 +16,17 @@ public interface IPlayClerkWagesDetailsInfoService extends IService<PlayClerkWag
/**
* 查询店员工资明细信息
*
* @param wagesId 店员工资统计ID
* @param wagesId
* 店员工资统计ID
* @return 店员工资明细信息
*/
List<PlayClerkWagesDetailsInfoEntity> selectByWagesId(String wagesId);
/**
* 根据订单ID
*
* @param orderId 订单ID
* @param orderId
* 订单ID
* @return 工资详情
*/
PlayClerkWagesDetailsInfoEntity selectByOrderId(String orderId);
@@ -34,15 +34,18 @@ public interface IPlayClerkWagesDetailsInfoService extends IService<PlayClerkWag
/**
* 根据工资结算ID和店员ID查询工资详情
*
* @param wagesId 结算ID
* @param clerkId 店员ID
* @param wagesId
* 结算ID
* @param clerkId
* 店员ID
* @return 工资详情
*/
PlayClerkWagesDetailsInfoEntity selectByClerkIdAndWagesId(String wagesId, String clerkId);
/**
* 查询店员工资明细信息
*
* @param id 店员工资明细信息主键
* @param id
* 店员工资明细信息主键
* @return 店员工资明细信息
*/
PlayClerkWagesDetailsInfoEntity selectPlayClerkWagesDetailsInfoById(String id);
@@ -50,15 +53,18 @@ public interface IPlayClerkWagesDetailsInfoService extends IService<PlayClerkWag
/**
* 查询店员工资明细信息列表
*
* @param playClerkWagesDetailsInfo 店员工资明细信息
* @param playClerkWagesDetailsInfo
* 店员工资明细信息
* @return 店员工资明细信息集合
*/
IPage<PlayClerkWagesDetailsInfoEntity> selectPlayClerkWagesDetailsInfoByPage(PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo);
IPage<PlayClerkWagesDetailsInfoEntity> selectPlayClerkWagesDetailsInfoByPage(
PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo);
/**
* 新增店员工资明细信息
*
* @param playClerkWagesDetailsInfo 店员工资明细信息
* @param playClerkWagesDetailsInfo
* 店员工资明细信息
* @return 结果
*/
boolean create(PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo);
@@ -66,7 +72,8 @@ public interface IPlayClerkWagesDetailsInfoService extends IService<PlayClerkWag
/**
* 修改店员工资明细信息
*
* @param playClerkWagesDetailsInfo 店员工资明细信息
* @param playClerkWagesDetailsInfo
* 店员工资明细信息
* @return 结果
*/
boolean update(PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo);
@@ -74,7 +81,8 @@ public interface IPlayClerkWagesDetailsInfoService extends IService<PlayClerkWag
/**
* 批量删除店员工资明细信息
*
* @param ids 需要删除的店员工资明细信息主键集合
* @param ids
* 需要删除的店员工资明细信息主键集合
* @return 结果
*/
int deletePlayClerkWagesDetailsInfoByIds(String[] ids);
@@ -82,7 +90,8 @@ public interface IPlayClerkWagesDetailsInfoService extends IService<PlayClerkWag
/**
* 删除店员工资明细信息信息
*
* @param id 店员工资明细信息主键
* @param id
* 店员工资明细信息主键
* @return 结果
*/
int deletePlayClerkWagesDetailsInfoById(String id);

38
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkWagesInfoService.java
View File

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesInfoEntity;
import com.starry.admin.modules.clerk.module.vo.PlayClerkWagesInfoQueryVo;
import com.starry.admin.modules.clerk.module.vo.PlayClerkWagesInfoReturnVo;
import java.time.LocalDate;
import java.util.List;
@@ -20,7 +19,8 @@ public interface IPlayClerkWagesInfoService extends IService<PlayClerkWagesInfoE
/**
* 根据店员ID查询店员工资结算信息
*
* @param clerkId 店员ID
* @param clerkId
* 店员ID
* @return 店员工资结算信息
*/
PlayClerkWagesInfoEntity selectCurrentPeriodWagesByClerkId(String clerkId);
@@ -28,16 +28,17 @@ public interface IPlayClerkWagesInfoService extends IService<PlayClerkWagesInfoE
/**
* 根据店员ID查询店员往期工资
*
* @param clerkId 店员ID
* @param clerkId
* 店员ID
* @return 店员工资结算信息
*/
List<PlayClerkWagesInfoEntity> selectHistoricalWagesByClerkId(String clerkId);
/**
* 获取最后一次统计
*
* @param clerkId 店员ID
* @param clerkId
* 店员ID
* @return 上次结算时间
*/
PlayClerkWagesInfoEntity getLastSettlement(String clerkId);
@@ -45,16 +46,17 @@ public interface IPlayClerkWagesInfoService extends IService<PlayClerkWagesInfoE
/**
* 获取最后一次统计
*
* @param clerkId 店员ID
* @param clerkId
* 店员ID
* @return 上次结算时间
*/
LocalDate getLastSettlementTime(String clerkId);
/**
* 查询店员工资结算信息
*
* @param id 店员工资结算信息主键
* @param id
* 店员工资结算信息主键
* @return 店员工资结算信息
*/
PlayClerkWagesInfoEntity selectPlayClerkWagesInfoById(String id);
@@ -62,17 +64,17 @@ public interface IPlayClerkWagesInfoService extends IService<PlayClerkWagesInfoE
/**
* 分页查询工资统计信息
*
* @param vo 统计统计查询对象
* @param vo
* 统计统计查询对象
* @return 查询工资统计信息
*/
IPage<PlayClerkWagesInfoReturnVo> selectHistoricalByPage(PlayClerkWagesInfoQueryVo vo);
/**
* 查询店员工资结算信息列表
*
* @param playClerkWagesInfo 店员工资结算信息
* @param playClerkWagesInfo
* 店员工资结算信息
* @return 店员工资结算信息集合
*/
IPage<PlayClerkWagesInfoEntity> selectPlayClerkWagesInfoByPage(PlayClerkWagesInfoEntity playClerkWagesInfo);
@@ -80,7 +82,8 @@ public interface IPlayClerkWagesInfoService extends IService<PlayClerkWagesInfoE
/**
* 新增店员工资结算信息
*
* @param playClerkWagesInfo 店员工资结算信息
* @param playClerkWagesInfo
* 店员工资结算信息
* @return 结果
*/
boolean create(PlayClerkWagesInfoEntity playClerkWagesInfo);
@@ -88,7 +91,8 @@ public interface IPlayClerkWagesInfoService extends IService<PlayClerkWagesInfoE
/**
* 修改店员工资结算信息
*
* @param playClerkWagesInfo 店员工资结算信息
* @param playClerkWagesInfo
* 店员工资结算信息
* @return 结果
*/
boolean update(PlayClerkWagesInfoEntity playClerkWagesInfo);
@@ -96,7 +100,8 @@ public interface IPlayClerkWagesInfoService extends IService<PlayClerkWagesInfoE
/**
* 批量删除店员工资结算信息
*
* @param ids 需要删除的店员工资结算信息主键集合
* @param ids
* 需要删除的店员工资结算信息主键集合
* @return 结果
*/
int deletePlayClerkWagesInfoByIds(String[] ids);
@@ -104,7 +109,8 @@ public interface IPlayClerkWagesInfoService extends IService<PlayClerkWagesInfoE
/**
* 删除店员工资结算信息信息
*
* @param id 店员工资结算信息主键
* @param id
* 店员工资结算信息主键
* @return 结果
*/
int deletePlayClerkWagesInfoById(String id);

36
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayCustomArticleInfoService.java
View File

@@ -12,12 +12,15 @@ import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity;
*/
public interface IPlayCustomArticleInfoService extends IService<PlayCustomArticleInfoEntity> {
/**
* 查询顾客操作动态数据
* @param articleId 动态ID
* @param customId 客户ID
* @param endorseType 操作类型(1:点赞;0:收藏)
*
* @param articleId
* 动态ID
* @param customId
* 客户ID
* @param endorseType
* 操作类型(1:点赞;0:收藏)
* @return PlayCustomArticleInfoEntity
*/
PlayCustomArticleInfoEntity selectByArticleId(String articleId, String customId, String endorseType);
@@ -25,7 +28,8 @@ public interface IPlayCustomArticleInfoService extends IService<PlayCustomArticl
/**
* 查询陪聊点赞动态信息
*
* @param id 陪聊点赞动态信息主键
* @param id
* 陪聊点赞动态信息主键
* @return 陪聊点赞动态信息
*/
PlayCustomArticleInfoEntity selectPlayCustomArticleInfoById(String id);
@@ -33,15 +37,18 @@ public interface IPlayCustomArticleInfoService extends IService<PlayCustomArticl
/**
* 查询陪聊点赞动态信息列表
*
* @param playCustomArticleInfo 陪聊点赞动态信息
* @param playCustomArticleInfo
* 陪聊点赞动态信息
* @return 陪聊点赞动态信息集合
*/
IPage<PlayCustomArticleInfoEntity> selectPlayCustomArticleInfoByPage(PlayCustomArticleInfoEntity playCustomArticleInfo);
IPage<PlayCustomArticleInfoEntity> selectPlayCustomArticleInfoByPage(
PlayCustomArticleInfoEntity playCustomArticleInfo);
/**
* 新增陪聊点赞动态信息
*
* @param playCustomArticleInfo 陪聊点赞动态信息
* @param playCustomArticleInfo
* 陪聊点赞动态信息
* @return 结果
*/
boolean create(PlayCustomArticleInfoEntity playCustomArticleInfo);
@@ -49,7 +56,8 @@ public interface IPlayCustomArticleInfoService extends IService<PlayCustomArticl
/**
* 修改陪聊点赞动态信息
*
* @param playCustomArticleInfo 陪聊点赞动态信息
* @param playCustomArticleInfo
* 陪聊点赞动态信息
* @return 结果
*/
boolean update(PlayCustomArticleInfoEntity playCustomArticleInfo);
@@ -57,7 +65,8 @@ public interface IPlayCustomArticleInfoService extends IService<PlayCustomArticl
/**
* 批量删除陪聊点赞动态信息
*
* @param ids 需要删除的陪聊点赞动态信息主键集合
* @param ids
* 需要删除的陪聊点赞动态信息主键集合
* @return 结果
*/
int deletePlayCustomArticleInfoByIds(String[] ids);
@@ -65,16 +74,17 @@ public interface IPlayCustomArticleInfoService extends IService<PlayCustomArticl
/**
* 删除陪聊点赞动态信息信息
*
* @param id 陪聊点赞动态信息主键
* @param id
* 陪聊点赞动态信息主键
* @return 结果
*/
int deletePlayCustomArticleInfoById(String id);
/**
* 根据动态ID删除点赞信息
*
* @param articleId 动态ID
* @param articleId
* 动态ID
*/
void deleteByArticleId(String articleId);
}

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

@@ -10,11 +10,10 @@ import com.starry.admin.modules.clerk.module.entity.PlayAvatarFrameInfoEntity;
import com.starry.admin.modules.clerk.module.vo.PlayAvatarFrameInfoQueryVo;
import com.starry.admin.modules.clerk.service.IPlayAvatarFrameInfoService;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
/**
* 店员头像框Service业务层处理
@@ -23,14 +22,17 @@ import java.util.List;
* @since 2024-06-06
*/
@Service
public class PlayAvatarFrameInfoServiceImpl extends ServiceImpl<PlayAvatarFrameInfoMapper, PlayAvatarFrameInfoEntity> implements IPlayAvatarFrameInfoService {
public class PlayAvatarFrameInfoServiceImpl extends ServiceImpl<PlayAvatarFrameInfoMapper, PlayAvatarFrameInfoEntity>
implements
IPlayAvatarFrameInfoService {
@Resource
private PlayAvatarFrameInfoMapper playAvatarFrameInfoMapper;
/**
* 查询店员头像框
*
* @param id 店员头像框主键
* @param id
* 店员头像框主键
* @return 店员头像框
*/
@Override
@@ -38,13 +40,11 @@ public class PlayAvatarFrameInfoServiceImpl extends ServiceImpl<PlayAvatarFrameI
return this.baseMapper.selectById(id);
}
@Override
public List<PlayAvatarFrameInfoEntity> selectAll() {
return this.baseMapper.selectList(new LambdaQueryWrapper<>());
}
@Override
public IPage<PlayAvatarFrameInfoEntity> selectByPage(PlayAvatarFrameInfoQueryVo vo) {
return this.baseMapper.selectPage(new Page<>(vo.getPageNum(), vo.getPageSize()), new LambdaQueryWrapper<>());
@@ -53,11 +53,13 @@ public class PlayAvatarFrameInfoServiceImpl extends ServiceImpl<PlayAvatarFrameI
/**
* 查询店员头像框列表
*
* @param playAvatarFrameInfo 店员头像框
* @param playAvatarFrameInfo
* 店员头像框
* @return 店员头像框
*/
@Override
public IPage<PlayAvatarFrameInfoEntity> selectPlayAvatarFrameInfoByPage(PlayAvatarFrameInfoEntity playAvatarFrameInfo) {
public IPage<PlayAvatarFrameInfoEntity> selectPlayAvatarFrameInfoByPage(
PlayAvatarFrameInfoEntity playAvatarFrameInfo) {
Page<PlayAvatarFrameInfoEntity> page = new Page<>(1, 10);
return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>());
}
@@ -65,7 +67,8 @@ public class PlayAvatarFrameInfoServiceImpl extends ServiceImpl<PlayAvatarFrameI
/**
* 新增店员头像框
*
* @param playAvatarFrameInfo 店员头像框
* @param playAvatarFrameInfo
* 店员头像框
* @return 结果
*/
@Override
@@ -79,7 +82,8 @@ public class PlayAvatarFrameInfoServiceImpl extends ServiceImpl<PlayAvatarFrameI
/**
* 修改店员头像框
*
* @param playAvatarFrameInfo 店员头像框
* @param playAvatarFrameInfo
* 店员头像框
* @return 结果
*/
@Override
@@ -90,7 +94,8 @@ public class PlayAvatarFrameInfoServiceImpl extends ServiceImpl<PlayAvatarFrameI
/**
* 批量删除店员头像框
*
* @param ids 需要删除的店员头像框主键
* @param ids
* 需要删除的店员头像框主键
* @return 结果
*/
@Override
@@ -101,7 +106,8 @@ public class PlayAvatarFrameInfoServiceImpl extends ServiceImpl<PlayAvatarFrameI
/**
* 删除店员头像框信息
*
* @param id 店员头像框主键
* @param id
* 店员头像框主键
* @return 结果
*/
@Override

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

@@ -19,11 +19,10 @@ import com.starry.admin.modules.weichat.entity.article.PlayClerkArticleCustomQue
import com.starry.admin.modules.weichat.entity.article.PlayClerkArticleCustomReturnVo;
import com.starry.admin.utils.SecurityUtils;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
/**
* 店员动态信息Service业务层处理
@@ -32,7 +31,9 @@ import java.util.List;
* @since 2024-05-04
*/
@Service
public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticleInfoMapper, PlayClerkArticleInfoEntity> implements IPlayClerkArticleInfoService {
public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticleInfoMapper, PlayClerkArticleInfoEntity>
implements
IPlayClerkArticleInfoService {
@Resource
private PlayClerkArticleInfoMapper playClerkArticleInfoMapper;
@@ -42,7 +43,8 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticl
/**
* 查询店员动态信息
*
* @param id 店员动态信息主键
* @param id
* 店员动态信息主键
* @return 店员动态信息
*/
@Override
@@ -57,20 +59,27 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticl
/**
* 查询店员动态信息列表
*
* @param vo 店员动态信息查询对象
* @param vo
* 店员动态信息查询对象
* @return 店员动态信息
*/
@Override
public IPage<PlayClerkArticleReturnVo> selectByPage(PlayClerkArticleQueryVo vo, boolean searchByYourself) {
MPJLambdaWrapper<PlayClerkArticleInfoEntity> lambdaQueryWrapper = new MPJLambdaWrapper<>();
//查询主表全部字段
// 查询主表全部字段
lambdaQueryWrapper.selectAll(PlayClerkArticleInfoEntity.class);
//陪聊用户表全部字段
lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar");
//陪聊动态表
lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkArticleInfoEntity::getClerkId);
//动态点赞表
lambdaQueryWrapper.selectCollection(PlayCustomArticleInfoEntity.class, PlayClerkArticleReturnVo::getArticleInfoEntities).leftJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId, PlayCustomArticleInfoEntity::getId);
// 陪聊用户表全部字段
lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId")
.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname")
.selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar");
// 陪聊动态表
lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId,
PlayClerkArticleInfoEntity::getClerkId);
// 动态点赞表
lambdaQueryWrapper
.selectCollection(PlayCustomArticleInfoEntity.class, PlayClerkArticleReturnVo::getArticleInfoEntities)
.leftJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId,
PlayCustomArticleInfoEntity::getId);
if (StrUtil.isNotBlank(vo.getClerkId())) {
lambdaQueryWrapper.eq(PlayClerkArticleInfoEntity::getClerkId, vo.getClerkId());
@@ -79,14 +88,17 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticl
lambdaQueryWrapper.eq(PlayClerkArticleInfoEntity::getReviewState, vo.getReviewState());
}
if (vo.getReleaseTime() != null && vo.getReleaseTime().size() == 2) {
lambdaQueryWrapper.between(PlayClerkArticleInfoEntity::getReleaseTime, vo.getReleaseTime().get(0), vo.getReleaseTime().get(1));
lambdaQueryWrapper.between(PlayClerkArticleInfoEntity::getReleaseTime, vo.getReleaseTime().get(0),
vo.getReleaseTime().get(1));
}
if (!searchByYourself) {
// 后台查询时，加入组员的筛选
List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null);
List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(),
null);
lambdaQueryWrapper.in(PlayClerkArticleInfoEntity::getClerkId, clerkIdList);
}
IPage<PlayClerkArticleReturnVo> page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleReturnVo.class, lambdaQueryWrapper);
IPage<PlayClerkArticleReturnVo> page = this.baseMapper.selectJoinPage(
new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleReturnVo.class, lambdaQueryWrapper);
for (PlayClerkArticleReturnVo record : page.getRecords()) {
int index = 0;
for (PlayCustomArticleInfoEntity articleInfoEntity : record.getArticleInfoEntities()) {
@@ -97,46 +109,55 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticl
}
record.setAgreedQuantity(index);
}
return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleReturnVo.class, lambdaQueryWrapper);
return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()),
PlayClerkArticleReturnVo.class, lambdaQueryWrapper);
}
@Override
public IPage<PlayClerkArticleCustomReturnVo> customSelectByPage(PlayClerkArticleCustomQueryVo vo, String customId) {
MPJLambdaWrapper<PlayClerkArticleInfoEntity> lambdaQueryWrapper = new MPJLambdaWrapper<>();
//查询主表全部字段
// 查询主表全部字段
lambdaQueryWrapper.selectAll(PlayClerkArticleInfoEntity.class);
//陪聊用户表全部字段
lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex");
//陪聊用户表全部字段
// 陪聊用户表全部字段
lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId")
.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname")
.selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar")
.selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex");
// 陪聊用户表全部字段
lambdaQueryWrapper.selectAs(PlayCustomArticleInfoEntity::getId, "id");
//陪聊动态表
lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkArticleInfoEntity::getClerkId);
// 陪聊动态表
lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId,
PlayClerkArticleInfoEntity::getClerkId);
if (StrUtil.isNotBlank(vo.getFollowState()) && "1".equals(vo.getFollowState())) {
//查询本人收藏的动态列表
lambdaQueryWrapper.innerJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId, PlayClerkArticleInfoEntity::getId);
// 查询本人收藏的动态列表
lambdaQueryWrapper.innerJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId,
PlayClerkArticleInfoEntity::getId);
lambdaQueryWrapper.eq(PlayCustomArticleInfoEntity::getCustomId, customId);
lambdaQueryWrapper.eq(PlayCustomArticleInfoEntity::getEndorseType, "0");
lambdaQueryWrapper.eq(PlayCustomArticleInfoEntity::getEndorseState, "1");
}
//查询指定店员动态
// 查询指定店员动态
if (StrUtil.isNotBlank(vo.getClerkId())) {
lambdaQueryWrapper.eq(PlayClerkArticleInfoEntity::getClerkId, vo.getClerkId());
}
//动态点赞表
lambdaQueryWrapper.selectCollection(PlayCustomArticleInfoEntity.class, PlayClerkArticleReturnVo::getArticleInfoEntities).leftJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId, PlayCustomArticleInfoEntity::getId);
// 动态点赞表
lambdaQueryWrapper
.selectCollection(PlayCustomArticleInfoEntity.class, PlayClerkArticleReturnVo::getArticleInfoEntities)
.leftJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId,
PlayCustomArticleInfoEntity::getId);
lambdaQueryWrapper.eq(PlayClerkArticleInfoEntity::getReviewState, "1");
IPage<PlayClerkArticleCustomReturnVo> page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleCustomReturnVo.class, lambdaQueryWrapper);
IPage<PlayClerkArticleCustomReturnVo> page = this.baseMapper.selectJoinPage(
new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleCustomReturnVo.class,
lambdaQueryWrapper);
for (PlayClerkArticleCustomReturnVo record : page.getRecords()) {
int index = 0;
for (PlayCustomArticleInfoEntity articleInfoEntity : record.getArticleInfoEntities()) {
//动态操作信息为空
// 动态操作信息为空
if (articleInfoEntity.getId() == null) {
continue;
}
//点赞或者动态处于激活状态
// 点赞或者动态处于激活状态
if ("1".equals(articleInfoEntity.getEndorseState())) {
if ("1".equals(articleInfoEntity.getEndorseType())) {
index++;
@@ -153,7 +174,8 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticl
/**
* 新增店员动态信息
*
* @param entity 店员动态信息
* @param entity
* 店员动态信息
* @return 结果
*/
@Override
@@ -168,11 +190,11 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticl
return save(entity);
}
/**
* 查询店员未审核的动态
*
* @param clerkId 店员ID
* @param clerkId
* 店员ID
* @return 店员未审核的动态列表
*/
public List<PlayClerkArticleInfoEntity> queryClerkUnauditedArticleInfo(String clerkId) {
@@ -185,7 +207,8 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticl
/**
* 修改店员动态信息
*
* @param playClerkArticleInfo 店员动态信息
* @param playClerkArticleInfo
* 店员动态信息
* @return 结果
*/
@Override
@@ -196,7 +219,8 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticl
/**
* 批量删除店员动态信息
*
* @param ids 需要删除的店员动态信息主键
* @param ids
* 需要删除的店员动态信息主键
* @return 结果
*/
@Override
@@ -207,7 +231,8 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticl
/**
* 删除店员动态信息信息
*
* @param id 店员动态信息主键
* @param id
* 店员动态信息主键
* @return 结果
*/
@Override

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

@@ -9,11 +9,10 @@ import com.starry.admin.modules.clerk.mapper.PlayClerkClassificationInfoMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkClassificationInfoEntity;
import com.starry.admin.modules.clerk.service.IPlayClerkClassificationInfoService;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
/**
* 店员分类Service业务层处理
@@ -22,14 +21,19 @@ import java.util.List;
* @since 2024-04-06
*/
@Service
public class PlayClerkClassificationInfoServiceImpl extends ServiceImpl<PlayClerkClassificationInfoMapper, PlayClerkClassificationInfoEntity> implements IPlayClerkClassificationInfoService {
public class PlayClerkClassificationInfoServiceImpl
extends
ServiceImpl<PlayClerkClassificationInfoMapper, PlayClerkClassificationInfoEntity>
implements
IPlayClerkClassificationInfoService {
@Resource
private PlayClerkClassificationInfoMapper playClerkClassificationInfoMapper;
/**
* 查询店员分类
*
* @param id 店员分类主键
* @param id
* 店员分类主键
* @return 店员分类
*/
@Override
@@ -37,7 +41,6 @@ public class PlayClerkClassificationInfoServiceImpl extends ServiceImpl<PlayCler
return this.baseMapper.selectById(id);
}
/**
* 查询店员分类列表
*
@@ -48,15 +51,16 @@ public class PlayClerkClassificationInfoServiceImpl extends ServiceImpl<PlayCler
return this.baseMapper.selectList(new LambdaQueryWrapper<>());
}
/**
* 查询店员分类列表
*
* @param playClerkClassificationInfo 店员分类
* @param playClerkClassificationInfo
* 店员分类
* @return 店员分类
*/
@Override
public IPage<PlayClerkClassificationInfoEntity> selectPlayClerkClassificationInfoByPage(PlayClerkClassificationInfoEntity playClerkClassificationInfo) {
public IPage<PlayClerkClassificationInfoEntity> selectPlayClerkClassificationInfoByPage(
PlayClerkClassificationInfoEntity playClerkClassificationInfo) {
Page<PlayClerkClassificationInfoEntity> page = new Page<>(1, 10);
return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>());
}
@@ -64,7 +68,8 @@ public class PlayClerkClassificationInfoServiceImpl extends ServiceImpl<PlayCler
/**
* 新增店员分类
*
* @param playClerkClassificationInfo 店员分类
* @param playClerkClassificationInfo
* 店员分类
* @return 结果
*/
@Override
@@ -78,7 +83,8 @@ public class PlayClerkClassificationInfoServiceImpl extends ServiceImpl<PlayCler
/**
* 修改店员分类
*
* @param playClerkClassificationInfo 店员分类
* @param playClerkClassificationInfo
* 店员分类
* @return 结果
*/
@Override
@@ -89,7 +95,8 @@ public class PlayClerkClassificationInfoServiceImpl extends ServiceImpl<PlayCler
/**
* 批量删除店员分类
*
* @param ids 需要删除的店员分类主键
* @param ids
* 需要删除的店员分类主键
* @return 结果
*/
@Override
@@ -100,7 +107,8 @@ public class PlayClerkClassificationInfoServiceImpl extends ServiceImpl<PlayCler
/**
* 删除店员分类信息
*
* @param id 店员分类主键
* @param id
* 店员分类主键
* @return 结果
*/
@Override

Some files were not shown because too many files have changed in this diff Show More