From f8c9479d2f33515376e5c0d87734edec2e15ad6f Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 15 十一月 2023 09:31:27 +0800 Subject: [PATCH] 后台bug修改 --- cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 48 insertions(+), 7 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java index 3cfdac8..9e1ff4b 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java +++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java @@ -33,6 +33,7 @@ import java.util.Comparator; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author zhibing.pu @@ -62,6 +63,33 @@ @Autowired private TokenUtil tokenUtil; + + + /** + * 根据门店ids获取课包ids 根据课包ids 获取购课记录的用户ids + */ + @ResponseBody + @PostMapping("/base/coursePackage/getCoursePackageByStoreIds") + public List<Integer> getCoursePackageByStoreIds(@RequestBody List<Integer> storeIds){ + try { + // 获取当前课包的ids + List<Integer> courseIds = coursePackageService.list(new QueryWrapper<TCoursePackage>().in("storeId", storeIds)) + .stream().map(TCoursePackage::getId).collect(Collectors.toList()); + if (courseIds.size() == 0){ + return new ArrayList<>(); + }else{ + List<Integer> userIds = tcppmenService.list(new QueryWrapper<TCoursePackagePayment>().in("coursePackageId", courseIds)) + .stream().map(TCoursePackagePayment::getAppUserId).collect(Collectors.toList()); + return userIds; + } + + }catch (Exception e){ + e.printStackTrace(); + return null; + } + } + + /** * 根据id获取课包 * @param id @@ -73,6 +101,18 @@ try { TCoursePackage coursePackage = coursePackageService.getById(id); return coursePackage; + }catch (Exception e){ + e.printStackTrace(); + return null; + } + } + + @ResponseBody + @PostMapping("/base/coursePackage/queryByStoreId") + public List<TCoursePackage> queryByStoreId(@RequestBody Integer shopId){ + try { + List<TCoursePackage> shopId1 = coursePackageService.list(new QueryWrapper<TCoursePackage>().eq("storeId", shopId)); + return shopId1; }catch (Exception e){ e.printStackTrace(); return null; @@ -102,9 +142,10 @@ * 根据课包类型获取课包 */ @ResponseBody - @PostMapping("/base/coursePackage/getCoursePackageByType") - public List<TCoursePackage> getCoursePackageByType(@RequestBody Integer typeId){ - return coursePackageService.list(new QueryWrapper<TCoursePackage>().eq("coursePackageTypeId", typeId)); + @PostMapping("/base/coursePackage/getCoursePackageByType/{typeId}/{storeId}") + public List<TCoursePackage> getCoursePackageByType(@PathVariable("typeId") Integer typeId,@PathVariable("storeId")Integer storeId){ + + return coursePackageService.list(new QueryWrapper<TCoursePackage>().eq("coursePackageTypeId", typeId).eq("storeId",storeId)); } /** * 本周福利列表 @@ -144,11 +185,11 @@ @ApiImplicitParam(name = "lat",value = "纬度",dataType = "String"), }) public ResultUtil<ExchangeCoursePackageResponse> discountCourseDatas(Integer coursePackageDiscountId,String lon,String lat){ - try { +// try { return ResultUtil.success(tcpdService.getWeekFreeCourseDetails(coursePackageDiscountId,lat,lon)); - }catch (Exception e){ - return ResultUtil.runErr(); - } +// }catch (Exception e){ +// return ResultUtil.runErr(); +// } } -- Gitblit v1.7.1