From 366d407470b8953170b2579ae6f4a79a34fbbddf Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 01 八月 2023 18:59:36 +0800 Subject: [PATCH] 更新部分课包管理 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java index f27d44d..fc79a76 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java @@ -4,11 +4,15 @@ import com.dsh.course.feignClient.course.CoursePackageClient; import com.dsh.course.feignClient.course.model.QueryCoursePackageLists; import com.dsh.guns.core.support.HttpKit; +import com.dsh.guns.modular.system.model.TStore; import com.dsh.guns.modular.system.service.ICoursePackageService; +import com.dsh.guns.modular.system.service.IStoreService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.util.List; import java.util.Map; /** @@ -20,6 +24,9 @@ @Resource private CoursePackageClient coursePackageClient; + + @Autowired + private IStoreService storeService; @@ -36,11 +43,12 @@ * @return */ @Override - public Page<Map<String, Object>> queryCoursePackageLists(String provinceCode, String cityCode, Integer coursePackageTypeId, String name, Integer status, Integer state) { + public Page<Map<String, Object>> queryCoursePackageLists(String provinceCode, String cityCode, Integer coursePackageTypeId, Integer storeId, String name, Integer status, Integer state) { QueryCoursePackageLists queryCoursePackageLists = new QueryCoursePackageLists(); queryCoursePackageLists.setProvinceCode(provinceCode); queryCoursePackageLists.setCityCode(cityCode); queryCoursePackageLists.setCoursePackageTypeId(coursePackageTypeId); + queryCoursePackageLists.setStoreId(storeId); queryCoursePackageLists.setName(name); queryCoursePackageLists.setState(state); queryCoursePackageLists.setStatus(status); @@ -49,6 +57,12 @@ queryCoursePackageLists.setOffset(Integer.valueOf(request.getParameter("offset"))); queryCoursePackageLists.setSort(request.getParameter("sort")); queryCoursePackageLists.setOrder(request.getParameter("order")); - return coursePackageClient.queryCoursePackageLists(queryCoursePackageLists); + Page<Map<String, Object>> mapPage = coursePackageClient.queryCoursePackageLists(queryCoursePackageLists); + List<Map<String, Object>> records = mapPage.getRecords(); + for (Map<String, Object> record : records) { + TStore store = storeService.getById(Integer.valueOf(record.get("storeId").toString())); + record.put("store", store.getName()); + } + return mapPage; } } -- Gitblit v1.7.1