@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil ;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper ;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper ;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction ;
import com.greenorange.promotion.annotation.RequiresPermission ;
import com.greenorange.promotion.common.BaseResponse ;
import com.greenorange.promotion.common.ResultUtils ;
@ -32,6 +33,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource ;
import jakarta.servlet.http.HttpServletRequest ;
import lombok.extern.slf4j.Slf4j ;
import org.apache.catalina.User ;
import org.apache.commons.collections.map.LazyMap ;
import org.apache.commons.lang3.StringUtils ;
import org.springframework.scheduling.annotation.Scheduled ;
import org.springframework.transaction.annotation.Transactional ;
@ -111,10 +114,11 @@ public class UserPerformanceSummaryController {
long pageSize = userPerformanceSummarySupervisorQueryRequest . getPageSize ( ) ;
String nickName = userPerformanceSummarySupervisorQueryRequest . getNickName ( ) ;
String phoneNumber = userPerformanceSummarySupervisorQueryRequest . getPhoneNumber ( ) ;
QueryWrapper < UserInfo > queryWrapper = new QueryWrapper < > ( ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( nickName ) , " n ickName" , nickName ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( phoneNumber ) , " p honeNumber" , phoneNumber ) ;
queryWrapper . eq ( " u serRole" , UserConstant . SUPERVISOR_ROLE ) ;
Lambda QueryWrapper< UserInfo > queryWrapper = new Lambda QueryWrapper< > ( ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( nickName ) , UserInfo : : getN ickName, nickName ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( phoneNumber ) , UserInfo : : getP honeNumber, phoneNumber ) ;
queryWrapper . eq ( UserInfo : : getU serRole, UserConstant . SUPERVISOR_ROLE ) ;
queryWrapper . select ( UserInfo : : getId , UserInfo : : getNickName , UserInfo : : getPhoneNumber ) ;
List < UserInfo > userInfoList = userInfoService . list ( queryWrapper ) ;
List < Long > ids = userInfoList . stream ( ) . map ( UserInfo : : getId ) . collect ( Collectors . toList ( ) ) ;
if ( ids . isEmpty ( ) ) ids . add ( - 10L ) ;
@ -164,10 +168,11 @@ public class UserPerformanceSummaryController {
String phoneNumber = userPerformanceSummaryQueryRequest . getPhoneNumber ( ) ;
Long supervisorUserId = userPerformanceSummaryQueryRequest . getSupervisorUserId ( ) ;
QueryWrapper < UserInfo > queryWrapper = new QueryWrapper < > ( ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( nickName ) , " n ickName" , nickName ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( phoneNumber ) , " p honeNumber" , phoneNumber ) ;
queryWrapper . eq ( " p arentUserId" , supervisorUserId ) ;
Lambda QueryWrapper< UserInfo > queryWrapper = new Lambda QueryWrapper< > ( ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( nickName ) , UserInfo : : getN ickName, nickName ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( phoneNumber ) , UserInfo : : getP honeNumber, phoneNumber ) ;
queryWrapper . eq ( UserInfo : : getP arentUserId, supervisorUserId ) ;
queryWrapper . select ( UserInfo : : getId , UserInfo : : getNickName , UserInfo : : getPhoneNumber ) ;
List < UserInfo > userInfoList = userInfoService . list ( queryWrapper ) ;
List < Long > ids = userInfoList . stream ( ) . map ( UserInfo : : getId ) . collect ( Collectors . toList ( ) ) ;
if ( ids . isEmpty ( ) ) ids . add ( - 10L ) ;
@ -218,9 +223,11 @@ public class UserPerformanceSummaryController {
courseOrderQueryWrapper . in ( " orderStatus " , OrderStatusConstant . SUCCESS , OrderStatusConstant . REFUNDED ) ;
List < Long > ids = userInfoService . findAllSubUser ( staffUserId ) ;
List < UserInfo > userInfoList = commonService . findByFieldInTargetField ( ids , userInfoService , Function . identity ( ) , UserInfo : : getId ) ;
courseOrderQueryWrapper . in ( " userId " , ids ) ;
List < UserInfo > userInfoList = commonService . findByFieldInTargetFieldWithSpecificFields ( ids , userInfoService , Function . identity ( ) , UserInfo : : getId ,
List . of ( UserInfo : : getId , UserInfo : : getNickName , UserInfo : : getPhoneNumber ) ) ;
courseOrderQueryWrapper . in ( " userId " , ids ) ;
Page < CourseOrder > page = courseOrderService . page ( new Page < > ( current , pageSize ) , courseOrderQueryWrapper ) ;
List < CourseOrder > courseOrderList = page . getRecords ( ) ;
List < CourseOrderDetailInfoVO > courseOrderDetailInfoVOS = commonService . convertList ( courseOrderList , CourseOrderDetailInfoVO . class ) ;
@ -234,7 +241,11 @@ public class UserPerformanceSummaryController {
courseOrderBaseInfoVOS . setPhoneNumber ( userInfo . getPhoneNumber ( ) ) ;
}
List < CoursePromotionCommissionPending > coursePromotionCommissionPendingList = commonService . findByFieldInTargetField( courseOrderList , coursePromotionCommissionPendingService , CourseOrder : : getId , CoursePromotionCommissionPending : : getOrderId ) ;
List < CoursePromotionCommissionPending > coursePromotionCommissionPendingList = commonService . findByFieldInTargetFieldWithSpecificFields (
courseOrderList , coursePromotionCommissionPendingService , CourseOrder : : getId , CoursePromotionCommissionPending : : getOrderId ,
List . of ( CoursePromotionCommissionPending : : getFirstRate , CoursePromotionCommissionPending : : getSecondRate , CoursePromotionCommissionPending : : getFirstReward ,
CoursePromotionCommissionPending : : getSecondReward , CoursePromotionCommissionPending : : getCommissionStatus , CoursePromotionCommissionPending : : getOrderId ) ) ;
// 封装Map集合( 键: 用户id, 值:课程推广待提成记录)
Map < Long , CoursePromotionCommissionPending > coursePromotionCommissionPendingMap = new HashMap < > ( ) ;
for ( CoursePromotionCommissionPending coursePromotionCommissionPending : coursePromotionCommissionPendingList ) coursePromotionCommissionPendingMap . put ( coursePromotionCommissionPending . getOrderId ( ) , coursePromotionCommissionPending ) ;
@ -280,11 +291,12 @@ public class UserPerformanceSummaryController {
isAddDate = false ;
}
QueryWrapper < EmployeePromotionRecords > empQueryWrapper = new QueryWrapper < > ( ) ;
Lambda QueryWrapper< EmployeePromotionRecords > empQueryWrapper = new Lambda QueryWrapper< > ( ) ;
if ( isAddDate ) {
empQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , " c reateTime" , startDate ) ;
empQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , " c reateTime" , endDate ) ;
empQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , EmployeePromotionRecords : : getC reateTime, startDate ) ;
empQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , EmployeePromotionRecords : : getC reateTime, endDate ) ;
}
empQueryWrapper . select ( EmployeePromotionRecords : : getFirstUserId ) ;
List < EmployeePromotionRecords > employeePromotionRecordsList = employeePromotionRecordsService . list ( empQueryWrapper ) ;
// 封装Map集合( 键: 主管id, 值:推广数量)
Map < Long , Integer > supervisorCntMap = new HashMap < > ( ) ;
@ -299,9 +311,11 @@ public class UserPerformanceSummaryController {
Map < Long , BigDecimal > supervisorOrderAmountMap = new HashMap < > ( ) ;
// 封装Map集合( 键: 主管id, 值:净成交金额)
Map < Long , BigDecimal > supervisorNetSalesAmountMap = new HashMap < > ( ) ;
QueryWrapper < CoursePromotionCommissionPending > coursePromotionQueryWrapper = new QueryWrapper < > ( ) ;
coursePromotionQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , " o rderCreateTime" , startDate ) ;
coursePromotionQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , " o rderCreateTime" , endDate ) ;
Lambda QueryWrapper< CoursePromotionCommissionPending > coursePromotionQueryWrapper = new Lambda QueryWrapper< > ( ) ;
coursePromotionQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , CoursePromotionCommissionPending : : getO rderCreateTime, startDate ) ;
coursePromotionQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , CoursePromotionCommissionPending : : getO rderCreateTime, endDate ) ;
coursePromotionQueryWrapper . select ( CoursePromotionCommissionPending : : getFirstUserId , CoursePromotionCommissionPending : : getTotalAmount ,
CoursePromotionCommissionPending : : getUpdateTime , CoursePromotionCommissionPending : : getCommissionStatus ) ;
List < CoursePromotionCommissionPending > coursePromotionCommissionPendingList = coursePromotionCommissionPendingService . list ( coursePromotionQueryWrapper ) ;
for ( CoursePromotionCommissionPending coursePromotionCommissionPending : coursePromotionCommissionPendingList ) {
Long firstUserId = coursePromotionCommissionPending . getFirstUserId ( ) ;
@ -331,8 +345,11 @@ public class UserPerformanceSummaryController {
userInfoQueryWrapper . eq ( StringUtils . isNotBlank ( nickName ) , UserInfo : : getNickName , nickName )
. eq ( StringUtils . isNotBlank ( phoneNumber ) , UserInfo : : getPhoneNumber , phoneNumber )
. eq ( UserInfo : : getUserRole , UserConstant . SUPERVISOR_ROLE ) ;
userInfoQueryWrapper . select ( UserInfo : : getId , UserInfo : : getNickName , UserInfo : : getPhoneNumber ) ;
List < UserInfo > userInfoList = userInfoService . list ( userInfoQueryWrapper ) ;
List < UserPerformanceSummary > userPerformanceSummaryList = commonService . findByFieldInTargetField( userInfoList , userPerformanceSummaryService , UserInfo : : getId , UserPerformanceSummary : : getUserId ) ;
List < UserPerformanceSummary > userPerformanceSummaryList = commonService . findByFieldInTargetFieldWithSpecificFields (
userInfoList , userPerformanceSummaryService , UserInfo : : getId , UserPerformanceSummary : : getUserId ,
List . of ( UserPerformanceSummary : : getUserId , UserPerformanceSummary : : getEmpCount ) ) ;
// 封装Map集合( 键: 主管id, 用户信息)
Map < Long , UserInfo > userInfoMap = new HashMap < > ( ) ;
@ -384,11 +401,12 @@ public class UserPerformanceSummaryController {
} catch ( Exception e ) {
isAddDate = false ;
}
QueryWrapper < EmployeePromotionRecords > empQueryWrapper = new QueryWrapper < > ( ) ;
Lambda QueryWrapper< EmployeePromotionRecords > empQueryWrapper = new Lambda QueryWrapper< > ( ) ;
if ( isAddDate ) {
empQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , " c reateTime" , startDate ) ;
empQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , " c reateTime" , endDate ) ;
empQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , EmployeePromotionRecords : : getC reateTime, startDate ) ;
empQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , EmployeePromotionRecords : : getC reateTime, endDate ) ;
}
empQueryWrapper . select ( EmployeePromotionRecords : : getSecondUserId ) ;
List < EmployeePromotionRecords > employeePromotionRecordsList = employeePromotionRecordsService . list ( empQueryWrapper ) ;
// 封装Map集合( 键: 员工id, 值:推广数量)
Map < Long , Integer > staffCntMap = new HashMap < > ( ) ;
@ -403,9 +421,11 @@ public class UserPerformanceSummaryController {
Map < Long , BigDecimal > staffOrderAmountMap = new HashMap < > ( ) ;
// 封装Map集合( 键: 员工id, 值:净成交金额)
Map < Long , BigDecimal > staffNetSalesAmountMap = new HashMap < > ( ) ;
QueryWrapper < CoursePromotionCommissionPending > coursePromotionQueryWrapper = new QueryWrapper < > ( ) ;
coursePromotionQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , " o rderCreateTime" , startDate ) ;
coursePromotionQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , " order CreateTime" , endDate ) ;
Lambda QueryWrapper< CoursePromotionCommissionPending > coursePromotionQueryWrapper = new Lambda QueryWrapper< > ( ) ;
coursePromotionQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , CoursePromotionCommissionPending : : getO rderCreateTime, startDate ) ;
coursePromotionQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , CoursePromotionCommissionPending : : get CreateTime, endDate ) ;
coursePromotionQueryWrapper . select ( CoursePromotionCommissionPending : : getSecondUserId , CoursePromotionCommissionPending : : getTotalAmount ,
CoursePromotionCommissionPending : : getUpdateTime , CoursePromotionCommissionPending : : getCommissionStatus ) ;
List < CoursePromotionCommissionPending > coursePromotionCommissionPendingList = coursePromotionCommissionPendingService . list ( coursePromotionQueryWrapper ) ;
for ( CoursePromotionCommissionPending coursePromotionCommissionPending : coursePromotionCommissionPendingList ) {
Long secondUserId = coursePromotionCommissionPending . getSecondUserId ( ) ;
@ -435,9 +455,11 @@ public class UserPerformanceSummaryController {
userInfoQueryWrapper . eq ( StringUtils . isNotBlank ( nickName ) , UserInfo : : getNickName , nickName )
. eq ( StringUtils . isNotBlank ( phoneNumber ) , UserInfo : : getPhoneNumber , phoneNumber )
. eq ( UserInfo : : getUserRole , UserConstant . STAFF_ROLE ) ;
userInfoQueryWrapper . select ( UserInfo : : getId , UserInfo : : getNickName , UserInfo : : getPhoneNumber ) ;
List < UserInfo > userInfoList = userInfoService . list ( userInfoQueryWrapper ) ;
List < UserPerformanceSummary > userPerformanceSummaryList = commonService . findByFieldInTargetField( userInfoList , userPerformanceSummaryService , UserInfo : : getId , UserPerformanceSummary : : getUserId ) ;
List < UserPerformanceSummary > userPerformanceSummaryList = commonService . findByFieldInTargetFieldWithSpecificFields (
userInfoList , userPerformanceSummaryService , UserInfo : : getId , UserPerformanceSummary : : getUserId ,
List . of ( UserPerformanceSummary : : getUserId , UserPerformanceSummary : : getEmpCount ) ) ;
// 封装Map集合( 键: 主管id, 用户信息)
Map < Long , UserInfo > userInfoMap = new HashMap < > ( ) ;
for ( UserInfo userInfo : userInfoList ) {
@ -593,16 +615,17 @@ public class UserPerformanceSummaryController {
String nickName = miniUserPerformanceSummaryQueryRequest . getNickName ( ) ;
String phoneNumber = miniUserPerformanceSummaryQueryRequest . getPhoneNumber ( ) ;
QueryWrapper < UserInfo > queryWrapper = new QueryWrapper < > ( ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( nickName ) , " n ickName" , nickName ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( phoneNumber ) , " p honeNumber" , phoneNumber ) ;
queryWrapper . eq ( " u serRole" , UserConstant . SUPERVISOR_ROLE ) ;
Lambda QueryWrapper< UserInfo > queryWrapper = new Lambda QueryWrapper< > ( ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( nickName ) , UserInfo : : getN ickName, nickName ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( phoneNumber ) , UserInfo : : getP honeNumber, phoneNumber ) ;
queryWrapper . eq ( UserInfo : : getU serRole, UserConstant . SUPERVISOR_ROLE ) ;
queryWrapper . select ( UserInfo : : getId , UserInfo : : getNickName , UserInfo : : getPhoneNumber ) ;
List < UserInfo > userInfoList = userInfoService . list ( queryWrapper ) ;
List < Long > ids = userInfoList . stream ( ) . map ( UserInfo : : getId ) . collect ( Collectors . toList ( ) ) ;
if ( ids . isEmpty ( ) ) ids . add ( - 10L ) ;
QueryWrapper < UserPerformanceSummary > userPerformanceSummaryQueryWrapper = new QueryWrapper < > ( ) ;
userPerformanceSummaryQueryWrapper . in ( " u serId" , ids ) ;
Lambda QueryWrapper< UserPerformanceSummary > userPerformanceSummaryQueryWrapper = new Lambda QueryWrapper< > ( ) ;
userPerformanceSummaryQueryWrapper . in ( UserPerformanceSummary : : getU serId, ids ) ;
List < UserPerformanceSummary > userPerformanceSummaryList = userPerformanceSummaryService . list ( userPerformanceSummaryQueryWrapper ) ;
List < UserPerformanceSummaryDetailVO > userPerformanceSummaryDetailVOS = commonService . convertList ( userPerformanceSummaryList , UserPerformanceSummaryDetailVO . class ) ;
@ -637,16 +660,17 @@ public class UserPerformanceSummaryController {
String phoneNumber = miniUserPerformanceSummaryStaffQueryRequest . getPhoneNumber ( ) ;
Long supervisorUserId = miniUserPerformanceSummaryStaffQueryRequest . getSupervisorUserId ( ) ;
QueryWrapper < UserInfo > queryWrapper = new QueryWrapper < > ( ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( nickName ) , " n ickName" , nickName ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( phoneNumber ) , " p honeNumber" , phoneNumber ) ;
queryWrapper . eq ( " p arentUserId" , supervisorUserId ) ;
Lambda QueryWrapper< UserInfo > queryWrapper = new Lambda QueryWrapper< > ( ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( nickName ) , UserInfo : : getN ickName, nickName ) ;
queryWrapper . eq ( StringUtils . isNotBlank ( phoneNumber ) , UserInfo : : getP honeNumber, phoneNumber ) ;
queryWrapper . eq ( UserInfo : : getP arentUserId, supervisorUserId ) ;
queryWrapper . select ( UserInfo : : getId , UserInfo : : getNickName , UserInfo : : getPhoneNumber ) ;
List < UserInfo > userInfoList = userInfoService . list ( queryWrapper ) ;
List < Long > ids = userInfoList . stream ( ) . map ( UserInfo : : getId ) . collect ( Collectors . toList ( ) ) ;
if ( ids . isEmpty ( ) ) ids . add ( - 10L ) ;
QueryWrapper < UserPerformanceSummary > userPerformanceSummaryQueryWrapper = new QueryWrapper < > ( ) ;
userPerformanceSummaryQueryWrapper . in ( " u serId" , ids ) ;
Lambda QueryWrapper< UserPerformanceSummary > userPerformanceSummaryQueryWrapper = new Lambda QueryWrapper< > ( ) ;
userPerformanceSummaryQueryWrapper . in ( UserPerformanceSummary : : getU serId, ids ) ;
List < UserPerformanceSummary > userPerformanceSummaryList = userPerformanceSummaryService . list ( userPerformanceSummaryQueryWrapper ) ;
List < UserPerformanceSummaryDetailVO > userPerformanceSummaryDetailVOS = commonService . convertList ( userPerformanceSummaryList , UserPerformanceSummaryDetailVO . class ) ;
@ -679,14 +703,16 @@ public class UserPerformanceSummaryController {
public BaseResponse < List < CourseOrderDetailInfoVO > > miniListUserPerformanceSummary ( @Valid @RequestBody MiniUserCourseOrderQueryRequest miniUserCourseOrderQueryRequest ) {
String orderNumber = miniUserCourseOrderQueryRequest . getOrderNumber ( ) ;
Long staffUserId = miniUserCourseOrderQueryRequest . getStaffUserId ( ) ;
QueryWrapper < CourseOrder > courseOrderQueryWrapper = new QueryWrapper < > ( ) ;
courseOrderQueryWrapper . eq ( StringUtils . isNotBlank ( orderNumber ) , " o rderNumber" , orderNumber ) ;
courseOrderQueryWrapper . in ( " o rderStatus" , OrderStatusConstant . SUCCESS , OrderStatusConstant . REFUNDED ) ;
Lambda QueryWrapper< CourseOrder > courseOrderQueryWrapper = new Lambda QueryWrapper< > ( ) ;
courseOrderQueryWrapper . eq ( StringUtils . isNotBlank ( orderNumber ) , CourseOrder : : getO rderNumber, orderNumber ) ;
courseOrderQueryWrapper . in ( CourseOrder : : getO rderStatus, OrderStatusConstant . SUCCESS , OrderStatusConstant . REFUNDED ) ;
List < Long > ids = userInfoService . findAllSubUser ( staffUserId ) ;
List < UserInfo > userInfoList = commonService . findByFieldInTargetField ( ids , userInfoService , Function . identity ( ) , UserInfo : : getId ) ;
courseOrderQueryWrapper . in ( " userId " , ids ) ;
List < UserInfo > userInfoList = commonService . findByFieldInTargetFieldWithSpecificFields ( ids , userInfoService , Function . identity ( ) , UserInfo : : getId ,
List . of ( UserInfo : : getId , UserInfo : : getNickName , UserInfo : : getPhoneNumber ) ) ;
courseOrderQueryWrapper . in ( CourseOrder : : getUserId , ids ) ;
courseOrderQueryWrapper . select ( CourseOrder : : getId , CourseOrder : : getUserId , CourseOrder : : getOrderNumber , CourseOrder : : getTotalAmount , CourseOrder : : getOrderStatus , CourseOrder : : getCreateTime ) ;
List < CourseOrder > courseOrderList = courseOrderService . list ( courseOrderQueryWrapper ) ;
List < CourseOrderDetailInfoVO > courseOrderDetailInfoVOS = commonService . convertList ( courseOrderList , CourseOrderDetailInfoVO . class ) ;
@ -699,7 +725,10 @@ public class UserPerformanceSummaryController {
courseOrderBaseInfoVOS . setPhoneNumber ( userInfo . getPhoneNumber ( ) ) ;
}
List < CoursePromotionCommissionPending > coursePromotionCommissionPendingList = commonService . findByFieldInTargetField( courseOrderList , coursePromotionCommissionPendingService , CourseOrder : : getId , CoursePromotionCommissionPending : : getOrderId ) ;
List < CoursePromotionCommissionPending > coursePromotionCommissionPendingList = commonService . findByFieldInTargetFieldWithSpecificFields (
courseOrderList , coursePromotionCommissionPendingService , CourseOrder : : getId , CoursePromotionCommissionPending : : getOrderId ,
List . of ( CoursePromotionCommissionPending : : getFirstRate , CoursePromotionCommissionPending : : getSecondRate , CoursePromotionCommissionPending : : getFirstReward ,
CoursePromotionCommissionPending : : getSecondReward , CoursePromotionCommissionPending : : getCommissionStatus , CoursePromotionCommissionPending : : getOrderId ) ) ;
// 封装Map集合( 键: 用户id, 值:课程推广待提成记录)
Map < Long , CoursePromotionCommissionPending > coursePromotionCommissionPendingMap = new HashMap < > ( ) ;
for ( CoursePromotionCommissionPending coursePromotionCommissionPending : coursePromotionCommissionPendingList ) coursePromotionCommissionPendingMap . put ( coursePromotionCommissionPending . getOrderId ( ) , coursePromotionCommissionPending ) ;
@ -743,11 +772,12 @@ public class UserPerformanceSummaryController {
isAddDate = false ;
}
QueryWrapper < EmployeePromotionRecords > empQueryWrapper = new QueryWrapper < > ( ) ;
Lambda QueryWrapper< EmployeePromotionRecords > empQueryWrapper = new Lambda QueryWrapper< > ( ) ;
if ( isAddDate ) {
empQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , " c reateTime" , startDate ) ;
empQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , " c reateTime" , endDate ) ;
empQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , EmployeePromotionRecords : : getC reateTime, startDate ) ;
empQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , EmployeePromotionRecords : : getC reateTime, endDate ) ;
}
empQueryWrapper . select ( EmployeePromotionRecords : : getFirstUserId ) ;
List < EmployeePromotionRecords > employeePromotionRecordsList = employeePromotionRecordsService . list ( empQueryWrapper ) ;
// 封装Map集合( 键: 主管id, 值:推广数量)
Map < Long , Integer > supervisorCntMap = new HashMap < > ( ) ;
@ -762,9 +792,11 @@ public class UserPerformanceSummaryController {
Map < Long , BigDecimal > supervisorOrderAmountMap = new HashMap < > ( ) ;
// 封装Map集合( 键: 主管id, 值:净成交金额)
Map < Long , BigDecimal > supervisorNetSalesAmountMap = new HashMap < > ( ) ;
QueryWrapper < CoursePromotionCommissionPending > coursePromotionQueryWrapper = new QueryWrapper < > ( ) ;
coursePromotionQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , " o rderCreateTime" , startDate ) ;
coursePromotionQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , " o rderCreateTime" , endDate ) ;
Lambda QueryWrapper< CoursePromotionCommissionPending > coursePromotionQueryWrapper = new Lambda QueryWrapper< > ( ) ;
coursePromotionQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , CoursePromotionCommissionPending : : getO rderCreateTime, startDate ) ;
coursePromotionQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , CoursePromotionCommissionPending : : getO rderCreateTime, endDate ) ;
coursePromotionQueryWrapper . select ( CoursePromotionCommissionPending : : getFirstUserId , CoursePromotionCommissionPending : : getTotalAmount ,
CoursePromotionCommissionPending : : getUpdateTime , CoursePromotionCommissionPending : : getCommissionStatus ) ;
List < CoursePromotionCommissionPending > coursePromotionCommissionPendingList = coursePromotionCommissionPendingService . list ( coursePromotionQueryWrapper ) ;
for ( CoursePromotionCommissionPending coursePromotionCommissionPending : coursePromotionCommissionPendingList ) {
Long firstUserId = coursePromotionCommissionPending . getFirstUserId ( ) ;
@ -794,8 +826,11 @@ public class UserPerformanceSummaryController {
userInfoLambdaQueryWrapper . eq ( StringUtils . isNotBlank ( nickName ) , UserInfo : : getNickName , nickName )
. eq ( StringUtils . isNotBlank ( phoneNumber ) , UserInfo : : getPhoneNumber , phoneNumber )
. eq ( UserInfo : : getUserRole , UserConstant . SUPERVISOR_ROLE ) ;
userInfoLambdaQueryWrapper . select ( UserInfo : : getId , UserInfo : : getNickName , UserInfo : : getPhoneNumber ) ;
List < UserInfo > userInfoList = userInfoService . list ( userInfoLambdaQueryWrapper ) ;
List < UserPerformanceSummary > userPerformanceSummaryList = commonService . findByFieldInTargetField ( userInfoList , userPerformanceSummaryService , UserInfo : : getId , UserPerformanceSummary : : getUserId ) ;
List < UserPerformanceSummary > userPerformanceSummaryList = commonService . findByFieldInTargetFieldWithSpecificFields ( userInfoList , userPerformanceSummaryService , UserInfo : : getId , UserPerformanceSummary : : getUserId ,
List . of ( UserPerformanceSummary : : getUserId , UserPerformanceSummary : : getEmpCount ) ) ;
// 封装Map集合( 键: 主管id, 用户信息)
Map < Long , UserInfo > userInfoMap = new HashMap < > ( ) ;
@ -849,11 +884,12 @@ public class UserPerformanceSummaryController {
isAddDate = false ;
}
QueryWrapper < EmployeePromotionRecords > empQueryWrapper = new QueryWrapper < > ( ) ;
Lambda QueryWrapper< EmployeePromotionRecords > empQueryWrapper = new Lambda QueryWrapper< > ( ) ;
if ( isAddDate ) {
empQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , " c reateTime" , startDate ) ;
empQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , " c reateTime" , endDate ) ;
empQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , EmployeePromotionRecords : : getC reateTime, startDate ) ;
empQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , EmployeePromotionRecords : : getC reateTime, endDate ) ;
}
empQueryWrapper . select ( EmployeePromotionRecords : : getSecondUserId ) ;
List < EmployeePromotionRecords > employeePromotionRecordsList = employeePromotionRecordsService . list ( empQueryWrapper ) ;
// 封装Map集合( 键: 员工id, 值:推广数量)
Map < Long , Integer > staffCntMap = new HashMap < > ( ) ;
@ -868,9 +904,11 @@ public class UserPerformanceSummaryController {
Map < Long , BigDecimal > staffOrderAmountMap = new HashMap < > ( ) ;
// 封装Map集合( 键: 员工id, 值:净成交金额)
Map < Long , BigDecimal > staffNetSalesAmountMap = new HashMap < > ( ) ;
QueryWrapper < CoursePromotionCommissionPending > coursePromotionQueryWrapper = new QueryWrapper < > ( ) ;
coursePromotionQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , " o rderCreateTime" , startDate ) ;
coursePromotionQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , " o rderCreateTime" , endDate ) ;
Lambda QueryWrapper< CoursePromotionCommissionPending > coursePromotionQueryWrapper = new Lambda QueryWrapper< > ( ) ;
coursePromotionQueryWrapper . ge ( StringUtils . isNotBlank ( startTimeStr ) , CoursePromotionCommissionPending : : getO rderCreateTime, startDate ) ;
coursePromotionQueryWrapper . le ( StringUtils . isNotBlank ( endTimeStr ) , CoursePromotionCommissionPending : : getO rderCreateTime, endDate ) ;
coursePromotionQueryWrapper . select ( CoursePromotionCommissionPending : : getSecondUserId , CoursePromotionCommissionPending : : getTotalAmount ,
CoursePromotionCommissionPending : : getUpdateTime , CoursePromotionCommissionPending : : getCommissionStatus ) ;
List < CoursePromotionCommissionPending > coursePromotionCommissionPendingList = coursePromotionCommissionPendingService . list ( coursePromotionQueryWrapper ) ;
for ( CoursePromotionCommissionPending coursePromotionCommissionPending : coursePromotionCommissionPendingList ) {
Long secondUserId = coursePromotionCommissionPending . getSecondUserId ( ) ;
@ -900,6 +938,7 @@ public class UserPerformanceSummaryController {
userInfoLambdaQueryWrapper . eq ( StringUtils . isNotBlank ( nickName ) , UserInfo : : getNickName , nickName )
. eq ( StringUtils . isNotBlank ( phoneNumber ) , UserInfo : : getPhoneNumber , phoneNumber )
. eq ( UserInfo : : getUserRole , UserConstant . STAFF_ROLE ) ;
userInfoLambdaQueryWrapper . select ( UserInfo : : getId , UserInfo : : getNickName , UserInfo : : getPhoneNumber ) ;
List < UserInfo > userInfoList = userInfoService . list ( userInfoLambdaQueryWrapper ) ;
List < UserPerformanceSummary > userPerformanceSummaryList = commonService . findByFieldInTargetField ( userInfoList , userPerformanceSummaryService , UserInfo : : getId , UserPerformanceSummary : : getUserId ) ;