From b1779346519a5dd1adfa7337d01e23ac7b505373 Mon Sep 17 00:00:00 2001 From: fengyw Date: Thu, 22 Sep 2022 17:05:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/roncoo/education/course/job/CourseJob.java | 3 +++ .../roncoo/education/course/service/biz/CourseBiz.java | 4 ---- .../user/service/admin/biz/AdminOrderInfoBiz.java | 3 +++ .../education/user/service/admin/biz/AdminUsersBiz.java | 8 ++++++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/job/CourseJob.java b/roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/job/CourseJob.java index 8e7f370c..9fb416ca 100644 --- a/roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/job/CourseJob.java +++ b/roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/job/CourseJob.java @@ -1,6 +1,8 @@ package com.roncoo.education.course.job; import cn.hutool.core.collection.CollUtil; +import com.roncoo.education.common.core.enums.PutawayEnum; +import com.roncoo.education.common.core.enums.StatusIdEnum; import com.roncoo.education.common.core.tools.BeanUtil; import com.roncoo.education.common.es.EsCourse; import com.roncoo.education.course.dao.CourseDao; @@ -36,6 +38,7 @@ public class CourseJob { @Scheduled(fixedRate = 60000) public void course() { CourseExample example = new CourseExample(); + example.createCriteria().andStatusIdEqualTo(StatusIdEnum.YES.getCode()).andIsPutawayEqualTo(PutawayEnum.UP.getCode()); List courseList = courseDao.listByExample(example); if (CollUtil.isNotEmpty(courseList)) { List queries = new ArrayList<>(); diff --git a/roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/biz/CourseBiz.java b/roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/biz/CourseBiz.java index 33bfa532..98d93cbe 100644 --- a/roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/biz/CourseBiz.java +++ b/roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/biz/CourseBiz.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.roncoo.education.common.core.base.Result; import com.roncoo.education.common.core.enums.FreeEnum; -import com.roncoo.education.common.core.enums.PutawayEnum; import com.roncoo.education.common.core.enums.StatusIdEnum; import com.roncoo.education.common.core.tools.BeanUtil; import com.roncoo.education.common.service.BaseBiz; @@ -59,9 +58,6 @@ public class CourseBiz extends BaseBiz { if (!course.getStatusId().equals(StatusIdEnum.YES.getCode())) { return Result.error("该课程已被禁用"); } - if (course.getIsPutaway().equals(PutawayEnum.DOWN.getCode())) { - return Result.error("该课程已下架"); - } CourseResp courseResp = BeanUtil.copyProperties(course, CourseResp.class); if (ObjectUtil.isNotEmpty(userId)) { // userId存在，即为登录 diff --git a/roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/admin/biz/AdminOrderInfoBiz.java b/roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/admin/biz/AdminOrderInfoBiz.java index 6ecb3415..582b45da 100644 --- a/roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/admin/biz/AdminOrderInfoBiz.java +++ b/roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/admin/biz/AdminOrderInfoBiz.java @@ -1,6 +1,7 @@ package com.roncoo.education.user.service.admin.biz; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.DesensitizedUtil; import cn.hutool.core.util.ObjectUtil; import com.roncoo.education.common.core.base.Page; import com.roncoo.education.common.core.base.PageUtil; @@ -65,6 +66,8 @@ public class AdminOrderInfoBiz extends BaseBiz { Map courseViewVOMap = feignCourse.listByIds(courseIdList).stream().collect(Collectors.toMap(courseViewVO -> courseViewVO.getId(), courseViewVO -> courseViewVO)); for (AdminOrderInfoPageResp resp : respPage.getList()) { resp.setCourseViewVO(courseViewVOMap.get(resp.getCourseId())); + // 脱敏处理 + resp.setMobile(DesensitizedUtil.mobilePhone(resp.getMobile())); } } return Result.success(respPage); diff --git a/roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/admin/biz/AdminUsersBiz.java b/roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/admin/biz/AdminUsersBiz.java index 805d8bee..666bf4ce 100644 --- a/roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/admin/biz/AdminUsersBiz.java +++ b/roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/admin/biz/AdminUsersBiz.java @@ -1,5 +1,7 @@ package com.roncoo.education.user.service.admin.biz; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.DesensitizedUtil; import com.roncoo.education.common.core.base.Page; import com.roncoo.education.common.core.base.PageUtil; import com.roncoo.education.common.core.base.Result; @@ -43,6 +45,12 @@ public class AdminUsersBiz extends BaseBiz { example.setOrderByClause("id desc"); Page page = dao.page(req.getPageCurrent(), req.getPageSize(), example); Page respPage = PageUtil.transform(page, AdminUsersPageResp.class); + if (CollUtil.isNotEmpty(respPage.getList())) { + // 脱敏处理 + for (AdminUsersPageResp resp : respPage.getList()) { + resp.setMobile(DesensitizedUtil.mobilePhone(resp.getMobile())); + } + } return Result.success(respPage); } -- GitLab