czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2025-01-06 21:20:55 +08:00
parent d6e64ae2fc 8f48ea47a9
commit 59dd29f226
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java
View File

@@ -668,8 +668,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
List<Orders> orders = baseMapper.selectOrdersByOrdersNo(ordersNo, status, userId, courseId,
flag, time, userName, ordersType, TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), sysUserId, qdCode, sysUserName);
Set<Long> courseIds = orders.stream().map(Orders::getCourseId).collect(Collectors.toSet());
List<Course> courses = courseDao.selectBatchIds(courseIds);
Map<Long, String> map = courses.stream().collect(Collectors.toMap(Course::getCourseId, Course::getTitle));
orders.parallelStream().forEach(s -> {
s.setTitle(map.get(s.getCourseId()));
});
PageInfo<Orders> pageInfo = new PageInfo<>(orders);
return Result.success().put("data", PageUtils.page(pageInfo));
}

2
src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java
View File

@@ -43,7 +43,7 @@ public interface PayDetailsDao extends BaseMapper<PayDetails> {
int selectPayCount(Long userId);
Double instantselectSumPay(@Param("date") String date, @Param("userId") Long userId);
Double instantselectSumPay(@Param("startTime") String startTime,@Param("endTime") String endTime, @Param("userId") Long userId);
Double statisticsIncomeMoney(@Param("time") String time, @Param("flag") Integer flag, @Param("ordersType") Integer ordersType);

5
src/main/java/com/sqx/modules/pay/service/impl/PayDetailsServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.sqx.modules.pay.service.impl;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
@@ -80,7 +81,9 @@ public class PayDetailsServiceImpl extends ServiceImpl<PayDetailsDao, PayDetails
@Override
public Double instantselectSumPay(String date, Long userId) {
return payDetailsDao.instantselectSumPay(date, userId);
return payDetailsDao.instantselectSumPay(
DateUtil.beginOfMonth(DateUtil.parse(date)).toString(),
DateUtil.endOfMonth(DateUtil.parse(date)).toString(), userId);
}
@Override