|
@@ -5,13 +5,13 @@ import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.extra.spring.SpringUtil;
|
|
import cn.hutool.extra.spring.SpringUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
+import com.xxl.job.core.handler.annotation.XxlJob;
|
|
|
import com.ydtech.modules.partner.dao.PartnerExpiredCommissionMapper;
|
|
import com.ydtech.modules.partner.dao.PartnerExpiredCommissionMapper;
|
|
|
import com.ydtech.modules.partner.dao.PartnerPartnerAccountMapper;
|
|
import com.ydtech.modules.partner.dao.PartnerPartnerAccountMapper;
|
|
|
import com.ydtech.modules.partner.dao.PartnerPremiumDetailsMapper;
|
|
import com.ydtech.modules.partner.dao.PartnerPremiumDetailsMapper;
|
|
|
import com.ydtech.modules.partner.dao.PartnerUserMapper;
|
|
import com.ydtech.modules.partner.dao.PartnerUserMapper;
|
|
|
import com.ydtech.modules.partner.model.*;
|
|
import com.ydtech.modules.partner.model.*;
|
|
|
import com.ydtech.modules.partner.model.param.PartnerRuleEntity;
|
|
import com.ydtech.modules.partner.model.param.PartnerRuleEntity;
|
|
|
-import com.ydtech.modules.partner.service.PartnerLiftingRecordService;
|
|
|
|
|
import com.ydtech.modules.partner.service.PartnerRuleService;
|
|
import com.ydtech.modules.partner.service.PartnerRuleService;
|
|
|
import com.ydtech.utils.StringUtils;
|
|
import com.ydtech.utils.StringUtils;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -36,9 +36,6 @@ import java.util.stream.Collectors;
|
|
|
@Component
|
|
@Component
|
|
|
public class TimedTaskUtils {
|
|
public class TimedTaskUtils {
|
|
|
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private PartnerLiftingRecordService liftingRecordService;
|
|
|
|
|
-
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private PartnerPartnerAccountMapper accountMapper;
|
|
private PartnerPartnerAccountMapper accountMapper;
|
|
|
|
|
|
|
@@ -60,8 +57,8 @@ public class TimedTaskUtils {
|
|
|
/**
|
|
/**
|
|
|
* TODO 每天晚上 记录佣金过期记录
|
|
* TODO 每天晚上 记录佣金过期记录
|
|
|
*/
|
|
*/
|
|
|
- //@XxlJob("updateOrderDateNoon")
|
|
|
|
|
- @Scheduled(cron = "0 0 0 * * *")
|
|
|
|
|
|
|
+ @XxlJob("updateOrderDateNoon")
|
|
|
|
|
+ //@Scheduled(cron = "0 0 0 * * *")
|
|
|
public void updateOrderDateNoon() {
|
|
public void updateOrderDateNoon() {
|
|
|
log.info("记录佣金过期定时任务开始执行:{}", expireDays);
|
|
log.info("记录佣金过期定时任务开始执行:{}", expireDays);
|
|
|
List<PartnerUser> partnerUserList = partnerUserMapper.queryExpiredRecords(expireDays);
|
|
List<PartnerUser> partnerUserList = partnerUserMapper.queryExpiredRecords(expireDays);
|
|
@@ -135,7 +132,8 @@ public class TimedTaskUtils {
|
|
|
/**
|
|
/**
|
|
|
* TODO: 更新降级考核时间
|
|
* TODO: 更新降级考核时间
|
|
|
*/
|
|
*/
|
|
|
- @Scheduled(cron = "0 0 0 * * *")
|
|
|
|
|
|
|
+ @XxlJob("checkCommissionExpireTime")
|
|
|
|
|
+ //@Scheduled(cron = "0 0 0 * * *")
|
|
|
public void checkCommissionExpireTime() {
|
|
public void checkCommissionExpireTime() {
|
|
|
// TODO等级规则
|
|
// TODO等级规则
|
|
|
List<PartnerRuleEntity> partnerRuleEntities = partnerRuleService.queryAll();
|
|
List<PartnerRuleEntity> partnerRuleEntities = partnerRuleService.queryAll();
|