From ee9cb0da4a43bcf523ebb157678f64a2895fba1a Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期二, 10 十月 2023 15:30:38 +0800 Subject: [PATCH] 10.10 --- cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 325 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 311 insertions(+), 14 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java index 30ff749..b3aa303 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java +++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java @@ -1,19 +1,18 @@ package com.dsh.course.controller; +import cn.mb.cloud.common.data.controller.BaseController; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.dsh.course.entity.TCourse; -import com.dsh.course.entity.TCoursePackagePayment; -import com.dsh.course.entity.TCoursePackageType; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.dsh.course.entity.*; import com.dsh.course.feignclient.model.ExerciseVideo; import com.dsh.course.model.*; -import com.dsh.course.service.TCoursePackagePaymentService; -import com.dsh.course.service.TCoursePackageService; -import com.dsh.course.service.TCoursePackageTypeService; -import com.dsh.course.service.TCourseService; -import com.dsh.course.util.PayMoneyUtil; -import com.dsh.course.util.ResultUtil; -import com.dsh.course.util.TokenUtil; +import com.dsh.course.model.dto.CourseChangeStateDTO; +import com.dsh.course.model.dto.TQueryBenefitsVideosDTO; +import com.dsh.course.model.vo.TQueryBenefitsVideosVO; +import com.dsh.course.service.*; +import com.dsh.course.util.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,15 +26,18 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.PrintWriter; +import java.math.BigDecimal; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Api @CrossOrigin @RestController @RequestMapping("") -public class CourseController { +public class CourseController extends BaseController { private Logger logger = LoggerFactory.getLogger("business-log"); @@ -57,12 +59,32 @@ @Autowired private TCoursePackagePaymentService coursePackagePaymentService; + @Autowired + private TCoursePackageDiscountService discountService; + /** + * 上/下架 1为上架 2为下架 3为删除 + * + * @return + */ + @RequestMapping("/base/course/changeState") + @ResponseBody + public Object changeState(@RequestBody CourseChangeStateDTO dto){ + return courseService.changeState(dto); + } + /** + * 通过课程ids获取课程 + * @return + */ + @RequestMapping("/base/course/getCourseByCourseIds") + public List<TQueryBenefitsVideosVO> getCourseByCourseIds(@RequestBody TQueryBenefitsVideosDTO query){ + return courseService.getCourseByCourseIds(query); + } - @PostMapping("/course/queryList") + @PostMapping("/base/course/queryList") public List<ExerciseVideo> queryStuCourseAfterVideos(@RequestBody List<Integer> courseIds){ List<ExerciseVideo> videos = new ArrayList<>(); List<TCourse> list = courseService.list(new QueryWrapper<TCourse>() @@ -105,7 +127,6 @@ - @ResponseBody @PostMapping("/api/course/queryCourseList") @ApiOperation(value = "获取课程列表", tags = {"APP-课程列表"}) @@ -125,6 +146,24 @@ return ResultUtil.runErr(); } } + + + @ResponseBody + @PostMapping("/base/course/queryCourseListOne") + @ApiOperation(value = "获取课程列表", tags = {"APP-课程列表"}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") + }) + public ResultUtil<List<CoursePackageListVo>> queryCourseListOne(CoursePackageList coursePackageList){ + try { + List<CoursePackageListVo> coursePackageListVos = coursePackageService.queryCourseListOne( coursePackageList); + return ResultUtil.success(coursePackageListVos); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + @@ -154,7 +193,6 @@ - @ResponseBody @PostMapping("/api/course/paymentCourse") @ApiOperation(value = "支付课程", tags = {"APP-课程列表"}) @@ -167,6 +205,10 @@ if(null == uid){ return ResultUtil.tokenErr(); } + Long couponId = paymentCourseVo.getCouponId(); + if(couponId==null || couponId==0){ + paymentCourseVo.setCouponId(null); + } return coursePackageService.paymentCourse(uid, paymentCourseVo); }catch (Exception e){ e.printStackTrace(); @@ -174,6 +216,25 @@ } } + // 2.0 + @ResponseBody + @PostMapping("/api/course/paymentCourseCouponList") + @ApiOperation(value = "支付课程--完成后优惠券列表", tags = {"APP-课程列表"}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") + }) + public ResultUtil paymentCourseCouponList(Integer coursePackagePaymentConfigId){ + try { + Integer uid = tokenUtil.getUserIdFormRedis(); + if(null == uid){ + return ResultUtil.tokenErr(); + } + return coursePackageService.paymentCourseCouponList(uid, coursePackagePaymentConfigId); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } /** * 购买课程微信支付回调 @@ -259,4 +320,240 @@ return null; } } + + + /** + * 根据名称获取数据 + * @param name + * @return + */ + @ResponseBody + @PostMapping("/course/queryCourseByName") + public List<TCourse> queryCourseByName(@RequestBody String name){ + try { + return courseService.list(new QueryWrapper<TCourse>().like("name", name).eq("state", 1)); + }catch (Exception e){ + e.printStackTrace(); + return null; + } + } + + + @PostMapping("/course/getPageageType") + public List<Map<String, Object>> getPageageType(){ + List<TCoursePackageType> list = coursePackageTypeService.list(new LambdaQueryWrapper<TCoursePackageType>().eq(TCoursePackageType::getState, 1)); + ArrayList<Map<String, Object>> objects = new ArrayList<>(); + for (TCoursePackageType tCoursePackageType : list) { + HashMap<String, Object> map = new HashMap<>(); + map.put("id",tCoursePackageType.getId()); + map.put("name",tCoursePackageType.getName()); + objects.add(map); + } + return objects; + } + + + /** + * 获取课程管理列表数据 + * @param queryCourseList + * @return + */ + @ResponseBody + @PostMapping("/course/queryCourseLists") + public Page<Map<String, Object>> queryCourseLists(@RequestBody QueryCourseList queryCourseList){ + Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(queryCourseList.getLimit(), queryCourseList.getOffset(), queryCourseList.getSort(), queryCourseList.getOrder()); + Page<Map<String, Object>> mapPage = page.setRecords(courseService.queryCourseList(page, queryCourseList)); + return mapPage; + } + + + /** + * 添加课程 + * @param course + */ + @ResponseBody + @PostMapping("/course/addCourse") + public void addCourse(@RequestBody TCourse course){ + courseService.save(course); + } + + + /** + * 编辑数据 + * @param course + */ + @ResponseBody + @PostMapping("/course/editCourse") + public void editCourse(@RequestBody TCourse course){ + courseService.updateById(course); + } + + + /** + * 删除数据 + * @param id + */ + @ResponseBody + @PostMapping("/course/delCourseById") + public void delCourseById(@RequestBody Integer id){ + TCourse course = courseService.getById(id); + if(null != course){ + course.setState(3); + courseService.updateById(course); + } + } + + + /** + * 编辑数据状态 + * @param editCourseState + */ + @ResponseBody + @PostMapping("/course/editCourseState") + public void editCourseState(@RequestBody EditCourseState editCourseState){ + TCourse course = courseService.getById(editCourseState.getId()); + if(null != course){ + course.setState(editCourseState.getState()); + courseService.updateById(course); + } + } + + + /** + * 根据类型获取数据 + * @param type + * @return + */ + @ResponseBody + @PostMapping("/course/queryCourseByType") + public List<TCourse> queryCourseByType(@RequestBody Integer type){ + return courseService.list(new QueryWrapper<TCourse>().eq("type", type).eq("state", 1)); + } + + + @PostMapping("/course/queryPackageById") + public List<String> queryPackageById(@RequestBody Integer coursePackageId){ + ArrayList<String> strings = new ArrayList<>(); + TCoursePackage byId = coursePackageService.getById(coursePackageId); + Integer coursePackageTypeId = byId.getCoursePackageTypeId(); + strings.add(coursePackageTypeService.getById(coursePackageTypeId).getName()); + strings.add(byId.getName()); + + return strings; + + } + + @PostMapping("/course/getHours") + public String getHours(@RequestBody Integer coursePackageId1){ + return coursePackageService.getHours(coursePackageId1); + } + + @PostMapping("/course/queryByDiscountId") + public TCoursePackage queryByDiscountId(@RequestBody Integer id){ + TCoursePackageDiscount byId = discountService.getById(id); + TCoursePackage byId1 = coursePackageService.getById(byId.getCoursePackageId()); + return byId1; + } + + + @PostMapping("/course/queryDiscountById") + public Integer queryDiscountById(@RequestBody Integer id){ + TCoursePackageDiscount byId = discountService.getById(id); + return byId.getAuditStatus(); + } + @PostMapping("/course/queryDiscountList") + public List<DiscountList> queryDiscountList(@RequestBody QueryDiscountList queryDiscountList){ + return discountService.queryDiscountList(queryDiscountList); + } + + @PostMapping("/course/queryDiscountListAudit") + public List<DiscountList> queryDiscountListAudit(@RequestBody QueryDiscountList queryDiscountList){ + return discountService.queryDiscountListAudit(queryDiscountList); + } + + + @PostMapping("/course/updateState") + public Boolean updateState( @RequestBody DiscountUpdateState discountUpdateState){ + TCoursePackageDiscount byId = discountService.getById(discountUpdateState.getId()); + List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>().eq(TCoursePackageDiscount::getCoursePackageId, byId.getCoursePackageId())); + list.forEach(e->e.setStatus(discountUpdateState.getStatus())); + return discountService.updateBatchById(list); + } + + + @PostMapping("/course/auditDiscount") + public Boolean auditDiscount( @RequestBody AuditDiscount auditDiscount){ + TCoursePackageDiscount byId = discountService.getById(auditDiscount.getId()); + List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>().eq(TCoursePackageDiscount::getCoursePackageId, byId.getCoursePackageId())); + for (TCoursePackageDiscount tCoursePackageDiscount : list) { + tCoursePackageDiscount.setAuditStatus(auditDiscount.getType()); + tCoursePackageDiscount.setAuditRemark(auditDiscount.getText()); + } + + return discountService.updateBatchById(list); + } + + @PostMapping("/course/queryFee") + public HashMap<String, Object> queryFee(@RequestBody QueryDataFee queryDataFee){ + HashMap<String, Object> map = new HashMap<>(); + String data = queryDataFee.getData(); + List<Integer> ids = queryDataFee.getIds(); + if(ids.size()==0){ + ids.add(-1); + } + + LambdaQueryWrapper<TCoursePackagePayment> wrapper = new LambdaQueryWrapper<>(); + if(ToolUtil.isNotEmpty(data)){ + String stime = data.split(" - ")[0]+" 00:00:00"; + String etime = data.split(" - ")[1]+" 23:59:59"; + wrapper.between(TCoursePackagePayment::getInsertTime,stime,etime); + } + wrapper.in(TCoursePackagePayment::getAppUserId,ids); + wrapper.eq(TCoursePackagePayment::getPayStatus,2); + ArrayList<Integer> objects = new ArrayList<>(); + objects.add(1); + objects.add(2); + objects.add(5); + objects.add(6); + wrapper.in(TCoursePackagePayment::getPayType,objects); + List<TCoursePackagePayment> list = coursePackagePaymentService.list(wrapper); + double v = list.stream().map(TCoursePackagePayment::getCashPayment).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue(); + List<Integer> collect = list.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList()); + if(collect.size()==0){ + collect.add(-1); + } + // + List<TCoursePackage> list2 = coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().in(TCoursePackage::getId, collect)); + // 课类型 + List<TCoursePackageType> list1 = coursePackageTypeService.list(); + + for (TCoursePackagePayment tCoursePackagePayment : list) { + for (TCoursePackage tCoursePackage : list2) { + if(tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())){ + tCoursePackagePayment.setType(tCoursePackage.getCoursePackageTypeId()); + } + } + } + + ArrayList<HashMap<String, Object>> hashMaps = new ArrayList<>(); + + for (TCoursePackageType tCoursePackageType : list1) { + HashMap<String, Object> objectObjectHashMap = new HashMap<>(); + objectObjectHashMap.put("name",tCoursePackageType.getName()); + double a= 0; + for (TCoursePackagePayment tCoursePackagePayment : list) { + if(tCoursePackagePayment.getType().equals(tCoursePackageType.getId())){ + a += tCoursePackagePayment.getCashPayment().doubleValue(); + } + } + objectObjectHashMap.put("value",a); + hashMaps.add(objectObjectHashMap); + } + + HashMap<String, Object> map1 = new HashMap<>(); + map1.put("fee",v); + map1.put("data",hashMaps); + + return map1; + } } -- Gitblit v1.7.1