From ddbb38c54db9c3670e5ff53f4bf713525de1099d Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期二, 14 十一月 2023 09:12:10 +0800 Subject: [PATCH] 后台bug修改 --- cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 102 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 88 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 fa41b2b..25c7c31 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 @@ -5,19 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.dsh.course.entity.TCourse; -import com.dsh.course.entity.TCoursePackage; -import com.dsh.course.entity.TCoursePackagePayment; -import com.dsh.course.entity.TCoursePackageType; +import com.dsh.course.entity.*; +import com.dsh.course.entity.dto.SelectDto; import com.dsh.course.feignclient.model.ExerciseVideo; import com.dsh.course.model.*; 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.TCoursePackagePaymentService; -import com.dsh.course.service.TCoursePackageService; -import com.dsh.course.service.TCoursePackageTypeService; -import com.dsh.course.service.TCourseService; +import com.dsh.course.service.*; import com.dsh.course.util.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -33,10 +28,7 @@ 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.*; import java.util.stream.Collectors; @Api @@ -65,6 +57,9 @@ @Autowired private TCoursePackagePaymentService coursePackagePaymentService; + @Autowired + private TCoursePackageDiscountService discountService; + /** * 上/下架 1为上架 2为下架 3为删除 * @@ -73,7 +68,6 @@ @RequestMapping("/base/course/changeState") @ResponseBody public Object changeState(@RequestBody CourseChangeStateDTO dto){ - return courseService.changeState(dto); } @@ -283,6 +277,7 @@ @PostMapping("/base/course/aliPaymentCourseCallback") public void aliPaymentCourseCallback(HttpServletRequest request, HttpServletResponse response){ try { + System.err.println("=====支付宝回调======="); Map<String, String> map = payMoneyUtil.alipayCallback(request); if(null != map){ String code = map.get("out_trade_no"); @@ -305,6 +300,14 @@ }catch (Exception e){ e.printStackTrace(); } + } + + + //分账 + public void moneyOut(){ + + + } @@ -377,6 +380,8 @@ @ResponseBody @PostMapping("/course/addCourse") public void addCourse(@RequestBody TCourse course){ + course.setState(1); + course.setInsertTime(new Date()); courseService.save(course); } @@ -447,10 +452,79 @@ } @PostMapping("/course/getHours") - public String getHours(@RequestBody Integer coursePackageId1){ + public Integer 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; + } + @ResponseBody + @PostMapping("/course/queryByDiscountId1") + public TCoursePackage queryByDiscountId1(@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); + } + @Autowired + private ICoursePackagePaymentConfigService packagePaymentConfigService; + @PostMapping("/course/times") + public List<SelectDto> times(@RequestBody Integer oneId){ + List<CoursePackagePaymentConfig> list = packagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>().eq("coursePackageId",oneId)); + List<SelectDto> integerList = new ArrayList<>(); + for (CoursePackagePaymentConfig coursePackagePaymentConfig : list) { +// integerList.add(coursePackagePaymentConfig.getClassHours()); + SelectDto selectDto = new SelectDto(); + selectDto.setId(coursePackagePaymentConfig.getId()); + selectDto.setValue(String.valueOf(coursePackagePaymentConfig.getClassHours())); + integerList.add(selectDto); + } + + + return integerList; + } + @PostMapping("/course/queryFee") public HashMap<String, Object> queryFee(@RequestBody QueryDataFee queryDataFee){ HashMap<String, Object> map = new HashMap<>(); -- Gitblit v1.7.1