From 4d17e9219dfeb41db32e82340ec9af9faedb4ca5 Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期一, 27 十一月 2023 16:06:34 +0800 Subject: [PATCH] 11.27.3 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 2 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ICoursePackageService.java | 3 cloud-server-management/src/main/java/com/dsh/course/service/ISiteLockService.java | 14 ++ cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 39 +++++-- cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 20 +++ cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml | 1 /dev/null | 27 ----- cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 24 ++-- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 2 cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java | 4 cloud-server-management/src/main/java/com/dsh/course/mapper/SiteLockMapper.java | 7 - cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 120 ++++++++++++----------- cloud-server-management/src/main/java/com/dsh/course/service/impl/SiteLockServiceImpl.java | 24 ++++ 13 files changed, 164 insertions(+), 123 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java index 39ea1df..27620c9 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java +++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java @@ -1,11 +1,8 @@ package com.dsh.course.controller; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dsh.course.entity.*; import com.dsh.course.entity.TAppUser; @@ -15,8 +12,6 @@ import com.dsh.course.feignclient.account.model.Student; import com.dsh.course.feignclient.account.model.TCourseInfoRecord; import com.dsh.course.feignclient.account.model.TStudent; -import com.dsh.course.feignclient.activity.CouponClient; -import com.dsh.course.feignclient.activity.model.Coupon; import com.dsh.course.feignclient.model.*; import com.dsh.course.feignclient.other.StoreClient; import com.dsh.course.feignclient.other.model.Store; @@ -29,7 +24,6 @@ import com.dsh.course.model.vo.request.*; import com.dsh.course.model.vo.response.*; import com.dsh.course.service.*; -import com.dsh.course.service.impl.CoursePackageOrderStudentServiceImpl; import com.dsh.course.util.*; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -37,16 +31,10 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import net.bytebuddy.asm.Advice; -import org.aspectj.weaver.ast.Var; -import io.swagger.models.auth.In; -import org.checkerframework.checker.units.qual.C; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import org.springframework.web.client.RestTemplate; @@ -2116,6 +2104,33 @@ } +// @Autowired +// private ICoursePackageOrderStudentService orderStudentService; + + + @ResponseBody + @PostMapping("/coursePackagePayment/consumeCourse") + public ResultUtil consumeCourse(@RequestBody Integer coursePackagePaymentId) { + CoursePackageOrderStudent coursePackageOrderStudent = orderStudentService.getById(coursePackagePaymentId); + + TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrderStudent.getCoursePackageId()); + + if (coursePackageOrderStudent.getLaveClassHours()<coursePackage.getNeedNum()){ + return ResultUtil.error("当前学员课时数不足"); + } + coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours()-coursePackage.getNeedNum()); + orderStudentService.updateById(coursePackageOrderStudent); + CourseCounsum courseCounsum = new CourseCounsum(); + courseCounsum.setPaymentId(coursePackageOrderStudent.getId()); + courseCounsum.setChangeType(0); + courseCounsum.setNum(coursePackage.getNeedNum()); + courseCounsum.setInsertTime(new Date()); + courseCounsum.setReason("补课"); + courseCounsumService.save(courseCounsum); + return ResultUtil.success("补课成功"); + } + + @ResponseBody @PostMapping("/coursePackagePayment/CountqueryByClassId") public Integer CountqueryByClassId(@RequestBody Integer id) { diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java index 43613e8..f3ad740 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java +++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java @@ -269,6 +269,9 @@ } + @Autowired + private ICoursePackageOrderStudentService orderStudentService; + @RequestMapping("/insertBack") @ResponseBody public void insertBack(@RequestBody InsertBackDto insertBackDto) { @@ -280,14 +283,16 @@ moneyBack.setIds(insertBackDto.getIds()); moneyBackService.save(moneyBack); - List<TCoursePackagePayment> pays = paymentService.list(new QueryWrapper<TCoursePackagePayment>().in("id", insertBackDto.getIds())); - for (TCoursePackagePayment o : pays) { +// List<TCoursePackagePayment> pays = paymentService.list(new QueryWrapper<TCoursePackagePayment>().in("id", insertBackDto.getIds())); + + + List<CoursePackageOrderStudent> pays = orderStudentService.list(new QueryWrapper<CoursePackageOrderStudent>().in("id", insertBackDto.getIds())); + for (CoursePackageOrderStudent o : pays) { o.setStatus(4); o.setAppUserId(null); } - - paymentService.updateBatchById(pays); + orderStudentService.updateBatchById(pays); } @@ -317,6 +322,13 @@ byId.setStatus(2); moneyBackService.updateById(byId); + List<CoursePackageOrderStudent> pays = orderStudentService.list(new QueryWrapper<CoursePackageOrderStudent>().in("id", byId.getIds())); + for (CoursePackageOrderStudent o : pays) { + o.setStatus(1); + o.setAppUserId(null); + } + orderStudentService.updateBatchById(pays); + } @RequestMapping("/zeroClass") diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml index b16898d..b18cee6 100644 --- a/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml +++ b/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml @@ -60,6 +60,7 @@ LEFT JOIN t_course_package pg ON py.coursePackageId = pg.id <where> + py.status = 1 <if test="null != tStudentId"> and py.studentId = #{tStudentId} </if> diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java index e97de93..5c5d4e3 100644 --- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java +++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java @@ -7,6 +7,7 @@ import com.dsh.course.feignClient.course.model.TCoursePackagePayment; import com.dsh.guns.modular.system.model.*; import com.dsh.guns.modular.system.model.dto.CoursePackage; +import com.dsh.guns.modular.system.util.ResultUtil; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -83,6 +84,9 @@ TCoursePackagePayment queryCoursePackagePaymentById(@RequestParam("id")Long id); + @PostMapping("/coursePackagePayment/consumeCourse") + ResultUtil consumeCourse(@RequestBody Integer coursePackagePaymentId); + /** * 修改数据 * @param coursePackagePayment diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/SiteLockMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/SiteLockMapper.java index 985d5f6..0fcc718 100644 --- a/cloud-server-management/src/main/java/com/dsh/course/mapper/SiteLockMapper.java +++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/SiteLockMapper.java @@ -1,17 +1,12 @@ package com.dsh.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsh.course.entity.SiteLock; -import com.dsh.course.feignClient.other.model.TSiteLockDTO; -import com.dsh.guns.modular.system.model.SiteLock; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * @author zhibing.pu * @Date 2023/7/18 14:43 */ public interface SiteLockMapper extends BaseMapper<SiteLock> { - List<TSiteLockDTO> getListById(@Param("id") Integer id); } diff --git a/cloud-server-management/src/main/java/com/dsh/course/service/ISiteLockService.java b/cloud-server-management/src/main/java/com/dsh/course/service/ISiteLockService.java new file mode 100644 index 0000000..687ebdb --- /dev/null +++ b/cloud-server-management/src/main/java/com/dsh/course/service/ISiteLockService.java @@ -0,0 +1,14 @@ +package com.dsh.course.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.dsh.course.entity.SiteLock; + + +/** + * @author zhibing.pu + * @Date 2023/7/18 14:44 + */ +public interface ISiteLockService extends IService<SiteLock> { + + +} diff --git a/cloud-server-management/src/main/java/com/dsh/course/service/impl/SiteLockServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/course/service/impl/SiteLockServiceImpl.java new file mode 100644 index 0000000..8fc1c97 --- /dev/null +++ b/cloud-server-management/src/main/java/com/dsh/course/service/impl/SiteLockServiceImpl.java @@ -0,0 +1,24 @@ +package com.dsh.course.service.impl; + + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dsh.course.entity.SiteLock; +import com.dsh.course.mapper.SiteLockMapper; +import com.dsh.course.service.ISiteLockService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author zhibing.pu + * @Date 2023/7/18 14:45 + */ +@Service +public class SiteLockServiceImpl extends ServiceImpl<SiteLockMapper, SiteLock> implements ISiteLockService { + + + + +} diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java index 69c1311..6121a31 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java @@ -1292,7 +1292,7 @@ */ @ResponseBody @PostMapping("/makeUpMissedLessons") - public ResultUtil makeUpMissedLessons(Long id){ + public ResultUtil makeUpMissedLessons(Integer id){ System.out.println("==========coursePackage补课PaymentId======"+id); return coursePackageService.makeUpMissedLessons(id); } diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java index 32c31f1..2ab516e 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java @@ -19,6 +19,7 @@ import com.dsh.course.feignClient.other.BallClient; import com.dsh.course.feignClient.other.SiteClient; import com.dsh.course.feignClient.other.model.Site; +import com.dsh.course.service.ISiteLockService; import com.dsh.course.service.TGameConfigService; import com.dsh.guns.config.UserExt; import com.dsh.guns.core.base.controller.BaseController; @@ -1022,72 +1023,73 @@ private SiteClient siteClient; + @Autowired + private ISiteLockService siteLockService; @RequestMapping("/yuyuetimes/{id}") @ResponseBody - public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String day,String siteName,String halfName) { -// System.out.println("=======date======"+date); -// -// List<String> strings = new ArrayList<>(); -// -//// List<SiteBooking> siteBookings = siteClient.listBooks(id); -// List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>() -// .eq("siteId", id).like("times",date)); -//System.out.println("=======siteBookings======"+siteBookings); -// for (SiteBooking siteBooking : siteBookings) { -// String[] split = siteBooking.getTimes().split(";"); -// for (String s : split) { -// -// String convertedValue = s.substring(11); -// strings.add(convertedValue); -// } -// -// } -// System.out.println("======strings======="+strings); -// -// List<OrderDto> timeRanges = new ArrayList<>(); -// -// Site site = siteClient.listById(id); -//System.out.println("================"+site); -// String appointmentStartTime = site.getAppointmentStartTime(); -// String appointmentEndTime = site.getAppointmentEndTime(); -// -// String currentTime = appointmentStartTime; -// while (currentTime.compareTo(appointmentEndTime) < 0) { -// String nextTime = null; -// if("智慧场地".equals(site.getTypeName())){ -// nextTime=getNextTimeOne(currentTime); -// }else { -// nextTime= getNextTime(currentTime); -// } -// -// String timeRange = currentTime + "-" + nextTime; -// OrderDto orderDto = new OrderDto(); -// orderDto.setTime(timeRange); -// -// LocalTime currentTime1 = LocalTime.now(); -// LocalTime targetTime = LocalTime.parse(currentTime); -// -// boolean hasExceeded = currentTime1.isAfter(targetTime); -// if (hasExceeded){ -// orderDto.setState(0); -// } -// if (strings.contains(timeRange)){ -// orderDto.setState(0); -// } -// -// -// timeRanges.add(orderDto); -// currentTime = nextTime; -// } -// System.out.println("-------------"+timeRanges); -// -// return timeRanges; + public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String date,String siteName,String halfName) { + System.out.println("=======date======"+date); + + List<String> strings = new ArrayList<>(); + +// List<SiteBooking> siteBookings = siteClient.listBooks(id); + List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>() + .eq("siteId", id).like("times",date)); +System.out.println("=======siteBookings======"+siteBookings); + for (SiteBooking siteBooking : siteBookings) { + String[] split = siteBooking.getTimes().split(";"); + for (String s : split) { + + String convertedValue = s.substring(11); + strings.add(convertedValue); + } + + } + System.out.println("======strings======="+strings); + + List<OrderDto> timeRanges = new ArrayList<>(); + + Site site = siteClient.listById(id); +System.out.println("================"+site); + String appointmentStartTime = site.getAppointmentStartTime(); + String appointmentEndTime = site.getAppointmentEndTime(); + + String currentTime = appointmentStartTime; + while (currentTime.compareTo(appointmentEndTime) < 0) { + String nextTime = null; + if("智慧场地".equals(site.getTypeName())){ + nextTime=getNextTimeOne(currentTime); + }else { + nextTime= getNextTime(currentTime); + } + + String timeRange = currentTime + "-" + nextTime; + OrderDto orderDto = new OrderDto(); + orderDto.setTime(timeRange); + + LocalTime currentTime1 = LocalTime.now(); + LocalTime targetTime = LocalTime.parse(currentTime); + + boolean hasExceeded = currentTime1.isAfter(targetTime); + if (hasExceeded){ + orderDto.setState(0); + } + if (strings.contains(timeRange)){ + orderDto.setState(0); + } + + + timeRanges.add(orderDto); + currentTime = nextTime; + } + System.out.println("-------------"+timeRanges); + + return timeRanges; -return null; } diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java index ada2d2a..3e8d1a9 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java @@ -579,7 +579,7 @@ //// insertBackDto.setIds(ids); // System.out.println("=====insertBackDto========"+insertBackDto); - courseStuddentClient.changeStatus(id); + courseStuddentClient.noStatus(id); courseStuddentClient.backStausClass(id); // courseStuddentClient.zeroClass(id); diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ICoursePackageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ICoursePackageService.java index f1992e9..ea68ee6 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ICoursePackageService.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ICoursePackageService.java @@ -4,6 +4,7 @@ import com.dsh.course.feignClient.course.model.CoursePackageScheduling; import com.dsh.course.feignClient.course.model.TCoursePackage; import com.dsh.guns.modular.system.util.ResultUtil; +import io.swagger.models.auth.In; import java.util.List; import java.util.Map; @@ -170,7 +171,7 @@ * @param coursePackagePaymentId * @return */ - ResultUtil makeUpMissedLessons(Long coursePackagePaymentId); + ResultUtil makeUpMissedLessons(Integer coursePackagePaymentId); /** diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISiteLockService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISiteLockService.java deleted file mode 100644 index c4dc93f..0000000 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISiteLockService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.dsh.guns.modular.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.dsh.other.entity.SiteLock; -import com.dsh.other.model.dto.siteDto.TSiteLockDTO; - -import java.util.List; - -/** - * @author zhibing.pu - * @Date 2023/7/18 14:44 - */ -public interface ISiteLockService extends IService<SiteLock> { - List<TSiteLockDTO> getListById(Integer id); - - -} 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 c7a44d0..bcd5212 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 @@ -707,18 +707,18 @@ * @return */ @Override - public ResultUtil makeUpMissedLessons(Long coursePackagePaymentId) { - TCoursePackagePayment coursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackagePaymentId); - System.out.println("=========coursePackagePayment=====>"+coursePackagePayment); - if(coursePackagePayment.getStatus() == 2){ - return ResultUtil.error("该学员已退课"); - } - if(coursePackagePayment.getAbsencesNumber() == 0){ - return ResultUtil.error("当前不需要补课"); - } - coursePackagePayment.setAbsencesNumber(coursePackagePayment.getAbsencesNumber() - 1); - coursePackagePaymentClient.editCoursePackagePayment(coursePackagePayment); - return ResultUtil.success(); + public ResultUtil makeUpMissedLessons(Integer coursePackagePaymentId){ + ResultUtil resultUtil = coursePackagePaymentClient.consumeCourse(coursePackagePaymentId); +// System.out.println("=========coursePackagePayment=====>"+coursePackagePayment); +// if(coursePackagePayment.getStatus() == 2){ +// return ResultUtil.error("该学员已退课"); +// } +// if(coursePackagePayment.getAbsencesNumber() == 0){ +// return ResultUtil.error("当前不需要补课"); +// } +// coursePackagePayment.setAbsencesNumber(coursePackagePayment.getAbsencesNumber() - 1); +// coursePackagePaymentClient.editCoursePackagePayment(coursePackagePayment); + return resultUtil; } diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SiteLockServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SiteLockServiceImpl.java deleted file mode 100644 index 076e1f1..0000000 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SiteLockServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.dsh.guns.modular.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.dsh.other.entity.SiteLock; -import com.dsh.other.mapper.SiteLockMapper; -import com.dsh.other.model.dto.siteDto.TSiteLockDTO; -import com.dsh.other.service.ISiteLockService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author zhibing.pu - * @Date 2023/7/18 14:45 - */ -@Service -public class SiteLockServiceImpl extends ServiceImpl<SiteLockMapper, SiteLock> implements ISiteLockService { - @Autowired - private SiteLockMapper siteLockMapper; - - @Override - public List<TSiteLockDTO> getListById(Integer id) { - return siteLockMapper.getListById(id); - } - -} -- Gitblit v1.7.1