From 18b58aaf9bd99cadd0e7f80fe5d80586f2f4831a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 24 十一月 2023 18:32:43 +0800
Subject: [PATCH] 11.24
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 100 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 81 insertions(+), 19 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index 82a599e..6a521f0 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -328,13 +328,16 @@
// BenefitsVideos videosWithIds = bfvoClient.getVideosWithIds(detailsRequest.getVideoId());
TCourse byId = courseService.getById(detailsRequest.getVideoId());
TCoursePackage coursePackage = tcpmapper.selectById(detailsRequest.getCoursePackageId());
+ CoursePackageScheduling byId1 = new CoursePackageScheduling();
+ if (detailsRequest.getScId()!=null){
+ byId1 = coursePackageSchedulingService.getById(detailsRequest.getScId());
+ }
if (null != coursePackage){
response.setCoursePackageId(coursePackage.getId());
response.setVideoId(byId.getId());
response.setVideoURL(byId.getCourseVideo());
response.setVideoName(coursePackage.getName());
-// response.setIntegral(byId.getIntegral());
UserVideoDetails userVideoDetails = uvdmapper.selectOne(new QueryWrapper<UserVideoDetails>()
.eq("appUserId",appUserId )
.eq("coursePackageId",coursePackage.getId())
@@ -349,6 +352,10 @@
response.setSynopsis(byId.getIntroduce());
response.setDetailedDiagram(byId.getIntroductionDrawing());
response.setCover(byId.getCoverDrawing());
+ if (byId1.getIntegral()!=null) {
+ response.setIntegral(String.valueOf(byId1.getIntegral()));
+ }
+
}
return response;
@@ -370,11 +377,36 @@
return "ERROR";
}
+ @Autowired
+ private TOrderService orderService;
+
@Override
public List<RegisterCourseVo> queryRegisteredCourseList(CourseOfAfterRequest courseTypeId, Integer appUserId) {
List<RegisterCourseVo> courseVos = new ArrayList<>();
- List<TCoursePackagePayment> tCoursePackagePayments = this.list(new QueryWrapper<TCoursePackagePayment>()
- .eq("appUserId",appUserId ));
+
+ List<TOrder> orders = orderService.list(new QueryWrapper<TOrder>().eq("appUserId", appUserId));
+
+ List<String> paysId = new ArrayList<>();
+
+ List<TCoursePackagePayment> tCoursePackagePayments = new ArrayList<>();
+ for (TOrder order : orders) {
+ String[] split = order.getPaysId().split(",");
+// paysId.add(split[0]);
+ TCoursePackagePayment byId = this.getById(split[0]);
+ byId.setPayStatus(order.getIsPay());
+ byId.setOrderId(order.getId());
+ tCoursePackagePayments.add(byId);
+ }
+
+// List<TCoursePackagePayment> tCoursePackagePayments = this.list(new QueryWrapper<TCoursePackagePayment>()
+// .eq("appUserId",appUserId ));
+// List<TCoursePackagePayment> tCoursePackagePayments = this.list(new QueryWrapper<TCoursePackagePayment>()
+// .in("id",paysId ));
+
+
+
+
+
System.out.println(tCoursePackagePayments);
if (tCoursePackagePayments.size() > 0){
try {
@@ -385,6 +417,7 @@
// 2.0
registerCourseVo.setType(coursePackage.getType());
+ registerCourseVo.setOrderId(tCoursePackagePayment.getOrderId());
registerCourseVo.setCoursePayId(tCoursePackagePayment.getId());
registerCourseVo.setCoursePackageId(tCoursePackagePayment.getCoursePackageId());
registerCourseVo.setCoursePackTypeId(coursePackage.getCoursePackageTypeId());
@@ -429,7 +462,9 @@
// registerCourseVo.setCourseNums(coursePackageStudents.size() * 2);
registerCourseVo.setCourseNums(counts);
}
+// registerCourseVo.setPayStatus(tCoursePackagePayment.getPayStatus());
registerCourseVo.setPayStatus(tCoursePackagePayment.getPayStatus());
+
courseVos.add(registerCourseVo);
}
}catch (Exception e){
@@ -463,17 +498,19 @@
@Autowired
private TCoursePackageDiscountService coursePackageDiscountService;
+
+ @Resource StoreClient storeClient;
@Override
- public CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId) {
+ public CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId,String lon,String lat) {
AppUser appUser = appuClient.queryAppUser(appUserId);
CourseDetailsResponse response = new CourseDetailsResponse();
TCoursePackagePayment tCoursePackagePayment = this.baseMapper.selectById(coursePayId);
- List<TCoursePackagePayment> tCoursePackagePayments = this.baseMapper.selectList(new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId).eq("coursePackageId", tCoursePackagePayment.getCoursePackageId()));
- List<Integer> stuIds = new ArrayList<>();
- for (TCoursePackagePayment coursePackagePayment : tCoursePackagePayments) {
- stuIds.add(coursePackagePayment.getStudentId());
- }
- response.setStuIds(stuIds);
+// List<TCoursePackagePayment> tCoursePackagePayments = this.baseMapper.selectList(new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId).eq("coursePackageId", tCoursePackagePayment.getCoursePackageId()));
+// List<Integer> stuIds = new ArrayList<>();
+// for (TCoursePackagePayment coursePackagePayment : tCoursePackagePayments) {
+// stuIds.add(coursePackagePayment.getStudentId());
+// }
+// response.setStuIds(stuIds);
response.setChooseHours(tCoursePackagePayment.getClassHours());
@@ -482,6 +519,18 @@
if (coursePackage.getType()==2) {
response.setTime(new SimpleDateFormat("yyyy.MM.dd").format(coursePackage.getStartTime()) + "-" + new SimpleDateFormat("yyyy.MM.dd").format(coursePackage.getEndTime()));
}
+
+ Store store = storeClient.queryStoreById(coursePackage.getStoreId());
+ response.setStoreName(store.getName());
+
+ if(ToolUtil.isNotEmpty(lon) && ToolUtil.isNotEmpty(lat)){
+ Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());
+ double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ response.setDistance(wgs84);
+ }
+
+
+
response.setCoursePackageId(tCoursePackagePayment.getCoursePackageId());
@@ -1361,6 +1410,9 @@
@Autowired
private CoursePackageStudentService coursePackageStudentService;
+ @Autowired
+ private CourseCounsumService courseCounsumService;
+
@Override
@Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
public ResultUtil payCourse(PayCourseReq req,Integer userId) throws ParseException {
@@ -1513,14 +1565,24 @@
// 2.0
- TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord();
- tCourseInfoRecord.setUserId(userId);
- tCourseInfoRecord.setCourseId(req.getCourseId());
- tCourseInfoRecord.setName("体验购课");
- tCourseInfoRecord.setNum(req.getNum());
- tCourseInfoRecord.setTime(new Date());
- tCourseInfoRecord.setType(2);
- appuClient.addCourseInfoRecord(tCourseInfoRecord);
+// TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord();
+// tCourseInfoRecord.setUserId(userId);
+// tCourseInfoRecord.setCourseId(req.getCourseId());
+// tCourseInfoRecord.setName("体验购课");
+// tCourseInfoRecord.setNum(req.getNum());
+// tCourseInfoRecord.setTime(new Date());
+// tCourseInfoRecord.setType(2);
+// appuClient.addCourseInfoRecord(tCourseInfoRecord);
+
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setPaymentId(tCoursePackagePayment.getId());
+ courseCounsum.setChangeType(0);
+ courseCounsum.setNum(req.getNum());
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("体验购课");
+ courseCounsum.setAppUserId(userId);
+ courseCounsumService.save(courseCounsum);
+
if(tCoursePackagePayment.getLaveClassHours()<=3){
@@ -1555,7 +1617,7 @@
@Override
public boolean updateHoursById(TCoursePackagePayment byId, int i) {
- return this.baseMapper.updateHoursById(byId.getId(),i);
+ return this.baseMapper.updateHoursById1(byId.getId(),i);
}
--
Gitblit v1.7.1