From 6682f1fc47b87124db517ba0b67ee86fcedff473 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期二, 09 四月 2024 15:41:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalAppointmentPageDTO.java | 4 ++--
guns/src/main/java/cn/stylefeng/guns/modular/business/controller/UserManageController.java | 2 +-
rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomeIndexController.java | 2 +-
rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomePsychologicalColumnController.java | 2 +-
rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java | 11 ++++++-----
roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/mapper/mapping/CustomerMapper.xml | 11 +++++++----
rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/MentalAnalysisTimeConfigController.java | 4 ++--
roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java | 1 +
8 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalAppointmentPageDTO.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalAppointmentPageDTO.java
index 109216a..fb52199 100644
--- a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalAppointmentPageDTO.java
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalAppointmentPageDTO.java
@@ -14,8 +14,8 @@
@ApiModelProperty(value = "预约ID")
@ChineseDescription("预约ID")
private Long id;
- @ApiModelProperty(value = "状态：0预约中，2服务中，3已完成，9已取消")
- @ChineseDescription("状态：0预约中，2服务中，3已完成，9已取消")
+ @ApiModelProperty(value = "状态：1预约中，2服务中，3已完成，9已取消")
+ @ChineseDescription("状态：1预约中，2服务中，3已完成，9已取消")
private Integer statusFlag;
@ApiModelProperty(value = "预约类型")
diff --git a/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/UserManageController.java b/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/UserManageController.java
index 0e7a325..b1b3ec7 100644
--- a/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/UserManageController.java
+++ b/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/UserManageController.java
@@ -284,7 +284,7 @@
@ApiImplicitParam(name = "userId", value = "用户ID", dataTypeClass = Long.class),
@ApiImplicitParam(name = "name", value = "咨询师姓名", dataTypeClass = String.class),
@ApiImplicitParam(name = "telephone", value = "咨询师电话", dataTypeClass = String.class),
- @ApiImplicitParam(name = "statusFlag", value = "状态：0预约中，2服务中，3已完成，9已取消", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "statusFlag", value = "状态：1预约中，2服务中，3已完成，9已取消", dataTypeClass = Integer.class),
})
public ResponseData<PageResult<UserMentalAppointmentPageResponseDTO>> userMentalAppointmentPage(Integer pageNo, Integer pageSize, Long userId, String name, String telephone, Integer statusFlag) {
Page<UserMentalAppointmentPageResponseDTO> page = mentalAppointmentService.userMentalAppointmentPage(
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomeIndexController.java b/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomeIndexController.java
index c88009b..23ffbe8 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomeIndexController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomeIndexController.java
@@ -46,7 +46,7 @@
@Resource
private IStoreAppointmentService storeAppointmentService;
- @ApiOperation("banner列表 ")
+ @ApiOperation("banner列表")
@ApiImplicitParam(value = "类型：1首页、2课程、3咨询",name = "type",dataTypeClass = Integer.class)
@GetResource(name = "banner列表", path = "/banner")
public ResponseData<Banner> banner(Integer type) {
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomePsychologicalColumnController.java b/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomePsychologicalColumnController.java
index 0fcc610..a90a41a 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomePsychologicalColumnController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/home/controller/HomePsychologicalColumnController.java
@@ -58,7 +58,7 @@
PageFactory.page(pageNo, pageSize),
Wrappers.<PsychologicalColumn>lambdaQuery()
.eq(PsychologicalColumn::getIsDelete,DeleteEnum.NOT_DELETE.getCode())
- .like(StrUtil.isNotBlank(title), PsychologicalColumn::getArticleTitle,DeleteEnum.NOT_DELETE.getCode())
+ .like(StrUtil.isNotBlank(title), PsychologicalColumn::getArticleTitle, title)
.orderByDesc(PsychologicalColumn::getReleaseTime)
);
return new SuccessResponseData<>(PageResultFactory.createPageResult(page));
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
index 814b782..d1ba976 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
@@ -312,12 +312,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "分页：第几页（从1开始）", dataTypeClass = Integer.class, paramType = "query"),
@ApiImplicitParam(name = "pageSize", value = "分页：每页大小（默认10）", dataTypeClass = Integer.class, paramType = "query"),
- @ApiImplicitParam(name = "title", value = "帮助内容", dataTypeClass = Integer.class, paramType = "query")
+ @ApiImplicitParam(name = "title", value = "标题", dataTypeClass = String.class, paramType = "query"),
+ @ApiImplicitParam(name = "content", value = "内容", dataTypeClass = String.class, paramType = "query")
} )
- public ResponseData<PageResult<Help>> page(Integer pageNo, Integer pageSize,String title) {
- LambdaQueryWrapper<Help> lambdaQueryWrapper = new LambdaQueryWrapper<Help>().eq(Help::getIsDelete,false)
- .orderByAsc(Help::getSort);
- lambdaQueryWrapper.like(StrUtil.isNotBlank(title),Help::getTitle,title).or().like(StrUtil.isNotBlank(title),Help::getContent,title);
+ public ResponseData<PageResult<Help>> page(Integer pageNo, Integer pageSize, String title, String content) {
+ LambdaQueryWrapper<Help> lambdaQueryWrapper = new LambdaQueryWrapper<Help>().eq(Help::getIsDelete, false).orderByAsc(Help::getSort);
+ lambdaQueryWrapper.like(StrUtil.isNotBlank(title), Help::getTitle, title);
+ lambdaQueryWrapper.like(StrUtil.isNotBlank(content), Help::getContent, content);
Page<Help> page = this.helpService.page(PageFactory.page(pageNo, pageSize), lambdaQueryWrapper);
return new SuccessResponseData<>(PageResultFactory.createPageResult(page));
}
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/MentalAnalysisTimeConfigController.java b/rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/MentalAnalysisTimeConfigController.java
index bec2c6d..0b344fe 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/MentalAnalysisTimeConfigController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/MentalAnalysisTimeConfigController.java
@@ -56,7 +56,7 @@
@ApiImplicitParam(name = "searchEndTime", value = "结束时间", dataTypeClass = String.class, paramType = "query"),
@ApiImplicitParam(name = "userNickName", value = "用户姓名", dataTypeClass = String.class, paramType = "query"),
@ApiImplicitParam(name = "userTelephone", value = "联系电话", dataTypeClass = String.class, paramType = "query"),
- @ApiImplicitParam(name = "statusFlag", value = "状态：0预约中，2服务中，3已完成，9已取消", dataTypeClass = Integer.class, paramType = "query"),
+ @ApiImplicitParam(name = "statusFlag", value = "状态：1已分配，2服务中，3已完成，9已取消", dataTypeClass = Integer.class, paramType = "query"),
})
public ResponseData<List<MentalAppointmentPageDTO>> mentalAnalysisTimeConfigSchedule(Long counsellingInfoId, String searchBeginTime, String searchEndTime, String userNickName, String userTelephone, Integer statusFlag) {
List<MentalAppointmentPageDTO> list = mentalAppointmentService.mentalAnalysisTimeConfigSchedule(searchBeginTime, searchEndTime, counsellingInfoId, null, userNickName, userTelephone, statusFlag, null);
@@ -71,7 +71,7 @@
@ApiImplicitParam(name = "counsellingInfoId", value = "性格分析师ID", dataTypeClass = Long.class, paramType = "query"),
@ApiImplicitParam(name = "userNickName", value = "用户姓名", dataTypeClass = String.class, paramType = "query"),
@ApiImplicitParam(name = "userTelephone", value = "联系电话", dataTypeClass = String.class, paramType = "query"),
- @ApiImplicitParam(name = "statusFlag", value = "状态：0预约中，2服务中，3已完成，9已取消", dataTypeClass = Integer.class, paramType = "query"),
+ @ApiImplicitParam(name = "statusFlag", value = "状态：1预约中，2服务中，3已完成，9已取消", dataTypeClass = Integer.class, paramType = "query"),
})
public ResponseData<PageResult<MentalAppointmentPageDTO>> mentalAnalysisTimeConfigSchedulePage(Integer pageNo, Integer pageSize, Long counsellingInfoId, String userNickName, String userTelephone, Integer statusFlag) {
Page<MentalAppointmentPageDTO> page = mentalAppointmentService.getPage(
diff --git a/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java b/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java
index 0f551e5..3651853 100644
--- a/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java
+++ b/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java
@@ -62,6 +62,7 @@
// // 设置默认头像
// customer.setAvatar(FileConstants.DEFAULT_AVATAR_FILE_ID);
// customer.setAvatarObjectName(FileConstants.DEFAULT_AVATAR_FILE_OBJ_NAME);
+ customer.setAvatar(customerRequest.getAvatar());
// 设置默认积分0
customer.setScore(0);
diff --git a/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/mapper/mapping/CustomerMapper.xml b/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/mapper/mapping/CustomerMapper.xml
index e817a31..ae34329 100644
--- a/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/mapper/mapping/CustomerMapper.xml
+++ b/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/mapper/mapping/CustomerMapper.xml
@@ -4,11 +4,11 @@
<sql id="getWorkerByLineStatusAndPostType">
toc_customer o
- LEFT JOIN im_user_status im ON o.customer_id = im.userid
+ LEFT JOIN im_user_status ius ON o.customer_id = ius.userid
<where>
AND o.status_flag = 1
<if test="lineStatus != null and lineStatus != ''">
- AND im.`status` = #{lineStatus}
+ AND ius.`status` = #{lineStatus}
</if>
<if test="postType != null">
AND FIND_IN_SET( #{postType}, post_types )
@@ -29,11 +29,11 @@
<select id="randomWorkerByLineStatusAndPostNeWorkerId" resultType="cn.stylefeng.roses.kernel.customer.modular.entity.Customer">
SELECT customer_id FROM toc_customer o
- LEFT JOIN im_user_status im ON o.customer_id = im.userid
+ LEFT JOIN im_user_status ius ON o.customer_id = ius.userid
<where>
AND o.status_flag = 1
<if test="lineStatus != null and lineStatus != ''">
- AND im.`status` = #{lineStatus}
+ AND ius.`status` = #{lineStatus}
</if>
<if test="postType != null">
AND FIND_IN_SET( #{postType}, post_types )
@@ -41,6 +41,9 @@
<if test="postId != null">
AND FIND_IN_SET( #{postId}, post_ids )
</if>
+ <if test="workStatus != null">
+ AND o.work_status = #{workStatus}
+ </if>
<if test="eqWorkerIdList != null and eqWorkerIdList.size != 0">
AND o.customer_id IN
<foreach collection="eqWorkerIdList" item="item" open="(" separator="," close=")">
--
Gitblit v1.7.1