|
@@ -124,6 +124,11 @@ public class CoachServiceImpl implements ICoachService {
|
|
|
return Math.toIntExact(appOrderProInfoMapper.selectCount(
|
|
|
Wrappers.<AppOrderProInfo>lambdaQuery()
|
|
|
.eq(AppOrderProInfo::getStatus,0)
|
|
|
+ .ne(AppOrderProInfo::getType,6)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,0)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,4)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,5)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,6)
|
|
|
.eq(AppOrderProInfo::getDelFlag,0)
|
|
|
.in(AppOrderProInfo::getProductId, courseIds)
|
|
|
));
|
|
@@ -150,6 +155,11 @@ public class CoachServiceImpl implements ICoachService {
|
|
|
Wrappers.<AppOrderProInfo>lambdaQuery()
|
|
|
.select(AppOrderProInfo::getFamilyUserId)
|
|
|
.in(AppOrderProInfo::getProductId, courseIds)
|
|
|
+ .ne(AppOrderProInfo::getType,6)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,0)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,4)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,5)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,6)
|
|
|
.eq(AppOrderProInfo::getStatus, 0)
|
|
|
.eq(AppOrderProInfo::getDelFlag, 0)
|
|
|
.isNotNull(AppOrderProInfo::getFamilyUserId)
|
|
@@ -177,6 +187,11 @@ public class CoachServiceImpl implements ICoachService {
|
|
|
Wrappers.<AppOrderProInfo>lambdaQuery()
|
|
|
.eq(AppOrderProInfo::getProductId, id)
|
|
|
.eq(AppOrderProInfo::getStatus,0)
|
|
|
+ .ne(AppOrderProInfo::getType,6)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,0)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,4)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,5)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,6)
|
|
|
.eq(AppOrderProInfo::getDelFlag,0)
|
|
|
.ge(AppOrderProInfo::getCreateTime, Date.from(startOfYear.atZone(ZoneId.systemDefault()).toInstant())) // >= 2025-01-01
|
|
|
.lt(AppOrderProInfo::getCreateTime, Date.from(endOfYear.atZone(ZoneId.systemDefault()).toInstant())) // < 2026-01-01
|
|
@@ -194,6 +209,11 @@ public class CoachServiceImpl implements ICoachService {
|
|
|
return Math.toIntExact(appOrderProInfoMapper.selectCount(
|
|
|
Wrappers.<AppOrderProInfo>lambdaQuery()
|
|
|
.eq(AppOrderProInfo::getProductId, id)
|
|
|
+ .ne(AppOrderProInfo::getType,6)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,0)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,4)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,5)
|
|
|
+ .ne(AppOrderProInfo::getOrderStatus,6)
|
|
|
));
|
|
|
}
|
|
|
|