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

yyy

2026-05-06 b59bca62353f93424818a4dd39068b10948c5267

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/task/ActivityTask.java

@@ -55,21 +55,16 @@


    @Scheduled(cron = "0 0/1 * * * *")
    public void taskOrder1() {
        xpActicityService.updateStatus();
    }





    /**
     * 凌晨执行的定时任务
     */
    @Scheduled(cron = "0 0 0 * * *")
    public void taskOrder() {
        xpActicityService.updateStatus();
        //循环发放的活动
        pusCoupon();
    }







    /**
@@ -81,21 +76,18 @@
        if(activities.isEmpty()){
            return;
        }
        List<Long> activityIds = activities.stream().map(XpActivity::getId).collect(Collectors.toList());
        //获取发放人
        List<XpActicityUser> xpActicityUsers = xpActicityUserService.list(new QueryWrapper<XpActicityUser>().eq("is_deleted", 0)
                .in("actitcity_id", activityIds));
        for (XpActivity activity : activities) {
        List<XpActicityStrategy> list = xpActicityStrategyService.list(new QueryWrapper<XpActicityStrategy>()
                .eq("distribution_rules", 1)
                .eq("is_deleted", 0)
                .in("actitcity_id", activityIds));
                    .eq("actitcity_id", activity.getId()));
        for (XpActicityStrategy xpActicityStrategy : list) {
            //发放人
            List<XpActicityUser> collect = xpActicityUsers.stream().filter(s -> s.getActitcityStrategeId().equals(xpActicityStrategy.getId())).collect(Collectors.toList());




                String distributionTime = xpActicityStrategy.getDistributionTime();
                String format = LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm"));
                if(distributionTime.equals(format)){
                    xpActicityService.pushCoupon(activity, xpActicityStrategy);
                }
            }
        }
    }
}