From 312cd22230809437aae8462d71d3335e6540f78a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 12 十二月 2023 08:54:56 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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 154f99b..1d0f34f 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
@@ -62,6 +62,9 @@
@Autowired
private ICoursePackagePaymentConfigService coursePackagePaymentConfigService;
+ @Autowired
+ private ICoursePackageOrderService coursePackageOrderService;
+
/**
* 上/下架 1为上架 2为下架 3为删除
*
@@ -170,15 +173,16 @@
@ApiImplicitParam(value = "课包id", name = "id", dataType = "int", required = true),
@ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = false),
@ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
+ @ApiImplicitParam(value = "学员id", name = "stuId", dataType = "int", required = false),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<CoursePackageInfo> queryCourseInfo(Integer id, String lon, String lat, Long payId) {
+ public ResultUtil<CoursePackageInfo> queryCourseInfo(Integer id, String lon, String lat, Integer stuId) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if (null == uid) {
return ResultUtil.tokenErr();
}
- CoursePackageInfo coursePackageInfo = coursePackageService.queryCourseInfo(uid, id, lon, lat);
+ CoursePackageInfo coursePackageInfo = coursePackageService.queryCourseInfo(uid, id, lon, lat, stuId);
return ResultUtil.success(coursePackageInfo);
} catch (Exception e) {
e.printStackTrace();
@@ -533,25 +537,32 @@
List<Integer> ids = queryDataFee.getIds();
if (ids.size() == 0) {
ids.add(-1);
+ }else{
+ List<TCoursePackage> list = coursePackageService.list(new QueryWrapper<TCoursePackage>().in("storeId", ids)
+ .ne("status", 4).eq("auditStatus", 2).eq("state", 1));
+ ids = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
+ if(ids.size() == 0){
+ ids.add(-1);
+ }
}
- LambdaQueryWrapper<TCoursePackagePayment> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<CoursePackageOrder> 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.between(CoursePackageOrder::getInsertTime, stime, etime);
}
- wrapper.in(TCoursePackagePayment::getAppUserId, ids);
- wrapper.eq(TCoursePackagePayment::getPayStatus, 2);
+ wrapper.in(CoursePackageOrder::getCoursePackageId, ids);
+ wrapper.eq(CoursePackageOrder::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());
+ wrapper.in(CoursePackageOrder::getPayType, objects);
+ List<CoursePackageOrder> list = coursePackageOrderService.list(wrapper);
+ double v = list.stream().map(CoursePackageOrder::getCashPayment).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
+ List<Integer> collect = list.stream().map(CoursePackageOrder::getCoursePackageId).collect(Collectors.toList());
if (collect.size() == 0) {
collect.add(-1);
}
@@ -560,7 +571,7 @@
// 课类型
List<TCoursePackageType> list1 = coursePackageTypeService.list();
- for (TCoursePackagePayment tCoursePackagePayment : list) {
+ for (CoursePackageOrder tCoursePackagePayment : list) {
for (TCoursePackage tCoursePackage : list2) {
if (tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())) {
tCoursePackagePayment.setType(tCoursePackage.getCoursePackageTypeId());
@@ -574,7 +585,7 @@
HashMap<String, Object> objectObjectHashMap = new HashMap<>();
objectObjectHashMap.put("name", tCoursePackageType.getName());
double a = 0;
- for (TCoursePackagePayment tCoursePackagePayment : list) {
+ for (CoursePackageOrder tCoursePackagePayment : list) {
if (tCoursePackagePayment.getType().equals(tCoursePackageType.getId())) {
a += tCoursePackagePayment.getCashPayment().doubleValue();
}
--
Gitblit v1.7.1