admin1/jiaqingjiayi-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

基于业务需求修改了美甲师查询的逻辑

Browse Source
This commit is contained in:
gaomusan 2024-11-10 13:13:18 +08:00
parent d56738cac7
commit 0effa3a931
6 changed files with 103 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/ManicuristController.java
View File

@ -187,7 +187,7 @@ public class ManicuristController {
}
/**
* 查询全部美甲师(管理员)
* 查询全部美甲师（管理员）
*/
@ApiOperation(value = "查询全部美甲师")
@PostMapping("/queryAll")
@ -199,21 +199,34 @@ public class ManicuristController {
}
/**
* 搜索美甲师
* 查询全部美甲师（用户）
* 用于展示店铺信息
*/
@ApiOperation(value = "用户查询美甲师")
@PostMapping("/userQuery")
public BaseResponse<List<ManicuristVO>> UserQueryManicurist(@RequestBody ManicuristQueryRequest manicuristQueryRequest){
ThrowUtils.throwIf(manicuristQueryRequest == null, ErrorCode.NULL_ERROR);
QueryWrapper<Manicurist> queryWrapper = manicuristService.getQueryWrapper(manicuristQueryRequest);
List<Manicurist> manicuristList = manicuristService.list(queryWrapper);
@ApiOperation(value = "用户查询全部美甲师")
@GetMapping("/userQueryAll")
public BaseResponse<List<ManicuristVO>> UserQueryAllManicurist(){
List<Manicurist> manicuristList = manicuristService.list();
List<ManicuristVO> manicuristVO = manicuristService.getManicuristVO(manicuristList);
return ResultUtils.success(manicuristVO);
}
// /**
// * 搜索美甲师
// */
// @ApiOperation(value = "用户查询美甲师")
// @PostMapping("/userQuery")
// public BaseResponse<List<ManicuristVO>> UserQueryManicurist(@RequestBody ManicuristQueryRequest manicuristQueryRequest){
// ThrowUtils.throwIf(manicuristQueryRequest == null, ErrorCode.NULL_ERROR);
//
// QueryWrapper<Manicurist> queryWrapper = manicuristService.getQueryWrapper(manicuristQueryRequest);
//
// List<Manicurist> manicuristList = manicuristService.list(queryWrapper);
//
// List<ManicuristVO> manicuristVO = manicuristService.getManicuristVO(manicuristList);
//
// return ResultUtils.success(manicuristVO);
// }
}

26
project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/model/request/manicurist/ManicuristQueryRequest.java
View File

@ -17,17 +17,6 @@ public class ManicuristQueryRequest extends PageRequest implements Serializable
@Serial
private static final long serialVersionUID = -5433330530903928177L;
/**
* 美甲师唯一标识（主键，自增）
*/
@TableId(type = IdType.AUTO)
private Long id;
/**
* 用户ID（关联用户表）
*/
private Long userId;
/**
* 商家ID（关联商家表）
*/
@ -62,19 +51,4 @@ public class ManicuristQueryRequest extends PageRequest implements Serializable
* 美甲师的专长（如法式美甲、彩绘等）
*/
private String specialties;
/**
* 美甲师的服务评分
*/
private BigDecimal rating;
/**
* 美甲师的基本薪资
*/
private BigDecimal salary;
/**
* 美甲师头像的存储路径或链接
*/
private String manicuristAvatar;
}

5
project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/model/vo/ManicuristVO.java
View File

@ -30,11 +30,6 @@ public class ManicuristVO implements Serializable {
*/
private String email;
/**
* 美甲师入职日期
*/
private Date employment_date;
/**
* 美甲师的专长（如法式美甲、彩绘等）
*/

8
project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/service/ManicuristService.java
View File

@ -49,8 +49,8 @@ public interface ManicuristService extends IService<Manicurist> {
*/
List<ManicuristVO> getManicuristVO(List<Manicurist> manicuristList);
/**
* 获取查询条件
*/
QueryWrapper<Manicurist> getQueryWrapper(ManicuristQueryRequest manicuristQueryRequest);
// /**
// * 获取查询条件
// */
// QueryWrapper<Manicurist> getQueryWrapper(ManicuristQueryRequest manicuristQueryRequest);
}

144
project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/service/impl/ManicuristServiceImpl.java
View File

@ -218,78 +218,78 @@ public class ManicuristServiceImpl extends ServiceImpl<ManicuristMapper, Manicur
return manicuristList.stream().map(this::getManicuristVO).collect(Collectors.toList());
}
@Override
public QueryWrapper<Manicurist> getQueryWrapper(ManicuristQueryRequest manicuristQueryRequest) {
if (manicuristQueryRequest == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR, "请求参数为空");
}
Long id = manicuristQueryRequest.getId();
Long userId = manicuristQueryRequest.getUserId();
Long businessId = manicuristQueryRequest.getBusinessId();
String manicuristName = manicuristQueryRequest.getManicuristName();
Integer gender = manicuristQueryRequest.getGender();
String Phone = manicuristQueryRequest.getPhone();
String email = manicuristQueryRequest.getEmail();
Date employment_date = manicuristQueryRequest.getEmployment_date();
String specialties = manicuristQueryRequest.getSpecialties();
BigDecimal rating = manicuristQueryRequest.getRating();
BigDecimal salary = manicuristQueryRequest.getSalary();
QueryWrapper<Manicurist> queryWrapper = new QueryWrapper<>();
if (ObjectUtils.isNotEmpty(id)) {
queryWrapper.eq("id", id);
}
if (ObjectUtils.isNotEmpty(userId)) {
queryWrapper.eq("userId", userId);
}
if (ObjectUtils.isNotEmpty(businessId)) {
queryWrapper.eq("businessId", businessId);
}
if (ObjectUtils.isNotEmpty(manicuristName)) {
queryWrapper.eq("manicuristName", manicuristName);
}
if (ObjectUtils.isNotEmpty(gender)) {
queryWrapper.eq( "gender", gender);
}
if (ObjectUtils.isNotEmpty(Phone)) {
queryWrapper.eq( "Phone", Phone);
}
if (ObjectUtils.isNotEmpty(email)) {
queryWrapper.eq( "email", email);
}
if (ObjectUtils.isNotEmpty(employment_date)) {
queryWrapper.like( "employment_date", employment_date);
}
if (ObjectUtils.isNotEmpty(specialties)) {
queryWrapper.like( "specialties", specialties);
}
if (ObjectUtils.isNotEmpty(rating)) {
queryWrapper.like( "rating", rating);
}
if (ObjectUtils.isNotEmpty(salary)) {
queryWrapper.like( "salary", salary);
}
String sortField = manicuristQueryRequest.getSortField();
String sortOrder = manicuristQueryRequest.getSortOrder();
queryWrapper.orderBy(SqlUtils.validSortField(sortField), sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
sortField);
return queryWrapper;
}
// @Override
// public QueryWrapper<Manicurist> getQueryWrapper(ManicuristQueryRequest manicuristQueryRequest) {
// if (manicuristQueryRequest == null) {
// throw new BusinessException(ErrorCode.PARAMS_ERROR, "请求参数为空");
// }
//
//
// Long id = manicuristQueryRequest.getId();
// Long userId = manicuristQueryRequest.getUserId();
// Long businessId = manicuristQueryRequest.getBusinessId();
// String manicuristName = manicuristQueryRequest.getManicuristName();
// Integer gender = manicuristQueryRequest.getGender();
// String Phone = manicuristQueryRequest.getPhone();
// String email = manicuristQueryRequest.getEmail();
// Date employment_date = manicuristQueryRequest.getEmployment_date();
// String specialties = manicuristQueryRequest.getSpecialties();
// BigDecimal rating = manicuristQueryRequest.getRating();
// BigDecimal salary = manicuristQueryRequest.getSalary();
//
//
// QueryWrapper<Manicurist> queryWrapper = new QueryWrapper<>();
// if (ObjectUtils.isNotEmpty(id)) {
// queryWrapper.eq("id", id);
// }
//
// if (ObjectUtils.isNotEmpty(userId)) {
// queryWrapper.eq("userId", userId);
// }
//
// if (ObjectUtils.isNotEmpty(businessId)) {
// queryWrapper.eq("businessId", businessId);
// }
//
// if (ObjectUtils.isNotEmpty(manicuristName)) {
// queryWrapper.eq("manicuristName", manicuristName);
// }
//
// if (ObjectUtils.isNotEmpty(gender)) {
// queryWrapper.eq( "gender", gender);
// }
//
// if (ObjectUtils.isNotEmpty(Phone)) {
// queryWrapper.eq( "Phone", Phone);
// }
//
// if (ObjectUtils.isNotEmpty(email)) {
// queryWrapper.eq( "email", email);
// }
//
// if (ObjectUtils.isNotEmpty(employment_date)) {
// queryWrapper.like( "employment_date", employment_date);
// }
//
// if (ObjectUtils.isNotEmpty(specialties)) {
// queryWrapper.like( "specialties", specialties);
// }
//
// if (ObjectUtils.isNotEmpty(rating)) {
// queryWrapper.like( "rating", rating);
// }
//
// if (ObjectUtils.isNotEmpty(salary)) {
// queryWrapper.like( "salary", salary);
// }
//
// String sortField = manicuristQueryRequest.getSortField();
// String sortOrder = manicuristQueryRequest.getSortOrder();
// queryWrapper.orderBy(SqlUtils.validSortField(sortField), sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
// sortField);
//
// return queryWrapper;
// }
}

6
project/jiaqingjiayi/src/main/resources/application.yml
View File

@ -47,6 +47,6 @@ aliyun:
alipay:
#支付宝开放平台
appId: 2021004151684053
alipayPublicKey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoSEl6J0GoBCiuUmlaGOftoKftzBZL9/HwmcclIjHxDwM2Nmk7Q+p8nNSO4CtQU5nWZZBzSQ7/p0YBfdH5CGBpz9/vvB1va9CGYLLbog//n3kr4VPtC6cA0TNLiFgT86SzieL8wgRvfyba4q2lrGW1QN6Wnc5r3Ew3BepSvANDaETkLS2djwnOAN/i5RHSZWN948oiHEU8/c5SMjBwPi7g95LblZ3PfGa8h7MLXw+qD1CY1lumkT5Wt/Jv57akT2O/GryF90uEDZVR1bCuxK/1UDCT0MYj5Adl8D2cxVi57UgAPAD/BbGHF6tfnz3leC0S5zFxnb8i4uVGgsul89M9wIDAQAB"
appPrivateKey: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQChISXonQagEKK5SaVoY5+2gp+3MFkv38fCZxyUiMfEPAzY2aTtD6nyc1I7gK1BTmdZlkHNJDv+nRgF90fkIYGnP3++8HW9r0IZgstuiD/+feSvhU+0LpwDRM0uIWBPzpLOJ4vzCBG9/JtriraWsZbVA3padzmvcTDcF6lK8A0NoROQtLZ2PCc4A3+LlEdJlY33jyiIcRTz9zlIyMHA+LuD3ktuVnc98ZryHswtfD6oPUJjWW6aRPla38m/ntqRPY78avIX3S4QNlVHVsK7Er/VQMJPQxiPkB2XwPZzFWLntSAA8AP8FsYcXq1+fPeV4LRLnMXGdvyLi5UaCy6Xz0z3AgMBAAECggEAaGWvyB0lU8QzilWbJB2YN4o+rVRYFNqq9NwV+m7877nwoPezEh2aAQqS9xaSKsP/1l2yWJXngTqLfCIRpE/JT3Gm9TGbN8E71IeYAw+oVt1+s/JuB9JDJyMGxaK+Yjb3iza4SEisJiprEKyZTN3XWkCcn8yrxW5TN+bkuzb5XiA8j3VxT5S9dybFtXS8vxTaqF47XkbvSqj4ohmEiyiFWtQbLBON1Uoje+RNXZL6QNaKzck7QePFd5S9Qz97kHUWHC51qz+lXYlMUME5ORXQbckfreRKll0AzGr8r5rSz1FkOafywr6kAeIhiOa+r8AveNXg+U+0SpYN9ti9QZ8NcQKBgQDhW5M21Bgrfp/wsrumqlkePORNkh8/98Wgsz4uEVb2sNkLQyAdS4HNFzc1KldIoi3Vc+E7NBFPuVQ/d+o72iJ0eT+ThsoCiTAWJGkWouFSDWAFppqEY6Z3Le4gb6/xIZlAYdN1KQiJZORhBpfBTUGtmsxpXFRNdtQd6O88DDqW+wKBgQC3Cd4HwpytDCPynLw0tJfJyCSIVrt5Ksic2J5AXMCATbNB4UHX0FAvDZvxh/7fERBz3eB+q2hY4jKuTASL58eKEFnp32ggONyKGYasn4k8qNf8dnlVUnbN3r/vSG4r+3OY2QY5aiHELvIrUKtlrhg/j7T9qCtCafaoTEiGT9gxNQKBgQCVOfOIufdrTcUROPmDiofKux2etCTXUfXezPJexQKmBkMi7wcj/uzr5vSa0vfLVAEvuDUr4/WWqi08feZwTajFIcjUosu/1CIwd1nTMHYtxEeSVlk5U1dW0eY+OlbyQIJfnKfOjCZn/JQyH5B74vGbyMaU+huk1Avv5mAMjjh54wKBgElenS+DJQaAnVA833xI/6cUoQA9s/xH2A53DkhCZa+IddhskNYPXHTgAah5mQKVdoDbaYec8cDfOu1+7zuddvCyyTfkI3r3EAATZ1Z+xKYaECnU26IF4jV3mnwyDmd27clRBRuynUJkhxIxzeJ+PJ4N3sDmziBbFVI08cVU8BYZAoGAbDZONt1PFEFyIINZuTWbwK/BoHTzvDEmu2v6GXcslOurrgjMKArVT4TZyXoe56QJe9gJfmOYuTw6kwEzSDZtQvdi2jPNj4s14P8oWAro6x7tLo/18FQn/6DLpq9eaiI4TYN0P8NUI8sym9Ns8WFXFRb78vyx90j2apvV6+S8pek="
appId: 2021004144652242
alipayPublicKey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsP/3AQ6DbZbQhFafYUdRS8F6jSXJzYfF3N14L48Jo+xlGp1FW8uq2bu8izP9qcuFxui2CzuQflo0BM+XmSmRt6KkmyGSvGmCdf4gC/doTT7xtMaQu72Mvezr69VC0Lp5iJeLVHzV5/BMFdgfGee5HnAUU5bn4Ytlqw14kCxgeLitZltvHtirq7vVCXlWyikbdtmV0HgmzaWbrC+jVyb/nk9oH8PpV5juJmhwEuiReEdKPKMdPoeJK3sZ9dHsOx+Bm3LkEY075fPvpHDtJFaLi/k7fFY+0oQxsX92qRL9kViOAhMonvFFKZFK06vxuPUtuZelGrzGttiOjVJRRGIiaQIDAQAB"
appPrivateKey: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCrh54evp6VX68kLvmWybc945JbHaJDRJf6bDSKNwQfCkvEZxfOwYTGXu7XfZq2G/qmFJ6Xp9KxV0yYrxPwjXwPMU4E78/ZaMZ44iSTSq+qvMJMBR7PJOX1MkW7EFfhUPmb+5S0KQurjMQadY4b2VxeHwVxTRPKAdsm0tnfgN8/pO7TfpyGOWX5dRSIruQ3c+MFmJOy0cSZZ4tGlidqZDS9v4YJpmw3u5dX4BvGKtNMPaAnxSpLCDp1fd/vh6ROl71QkLFR+3mNQcwvDOGNJ2Rq78bgfkIVp0BBMySk5Mfv6kunh0QMaxK8wi+Y9swv7Iiyy7U2/zrBvA+1i3e5ctH9AgMBAAECggEBAJSiNrTjbp13RVewUNyFvIAnc4n62sE5bgw0uS5PUAXpsQ/mWW3yqLAQURxvnaFSC1bgpTA630qGoDvp8fhPUYIEslt6xnvY26qiIxly7Vegqyiegzzx90YKIvxexBfdR/4O+aNHsfIcT02yMcsWBYEVlmzAYnZ4N0OkD+EpVcpaIBv2HwGsJnczz41GQVl9GX2DOL8j8+eSWhZM0Jq3d1ksgcfUHH1TT12XCbEE3fKJEMKKlrjVPrtTb+v9m6t0okOgjW+z+IR0zY1HBR92yC+0/CP4FfkbGBhKNxsmbyU4ilTmKINHMy40bqGqrEYo+LBzhEKBT82eMbg9cJbL68ECgYEA37dP5hWEfuTWAoAwduI6OW8kTwxNddIigzTV3qlqEeo21K6RQOOTeYKXrpMmYG65MU5J3xF7AYyhb3rMpega++22Qybxlrme88hqe0s/DeSToG2mw1zYLkkHb5+oT05fCOlLmFGPeLRBfJTxjM6wPNX/1NvGOEVC9DekXuauWZECgYEAxEhmSne07LD6J2sYqsbmOb0zdOpCNT0a+7SomZwiMpVFcsxFvZhYJlcLwyR2m3deLphxwQBPbyxe8TtOZST7P7APpoeI4c0t6PL44vG3eUh+GHFVyf1dbLwMGa9gQ0JFRwBH5iDD2hfnTNfmcNUYzBRHZQK60FFlPCd566hOG60CgYBNVNJbmEiKjJOlnaYjEiRKQi7s3DXSambfr93V7/3oX2vArO8s3P3XXNsNz3POlbeSYZuLbkF00aXkITCokMjzGMKOB+Iu1c8qObcFE4eiR8b4B69DjM51gWz+mtPVRiP3sp0c8+SCNt0EMYAlyjSFcvvSGn40aUyxmqJI47iU4QKBgFYStaCkO9eriBcvFKMXE7BwMpdrftsfz6xfPawW1rw9zzWXNGH+43D0rPjHDagBQXDHcuLCwxKqb3vzmN4ryG3WRBavyqvSMPa9Tb0faGisDHelg4xPKd/b2qaMzHbSIdUP33egGKKT5t9AshH6sKQVpHU8LDXb67vkR8e6h34FAoGAf21Aea9/+3FavddWC/5j0fvESN2U58X0xf4R/FZLa5QsT/iCAo4QqaeYZvF6csWR6lu0zJB88gA+4s6G6xP1JERL3LbE2pHjDe0eNOIsWSzsINICQQ2s3Gm5mh75+/8dfAsRiAPi9nS7FJ74Tcryb4+txeZKiBZgLnEFeRLOB3U="