Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityGroupJoinTimeOutQuartz.java

@@ -8,7 +8,6 @@
import com.matrix.system.shopXcx.dao.ShopActivitiesDao;
import com.matrix.system.shopXcx.dao.ShopActivitiesGroupJoinDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.Scheduled;

@@ -28,13 +27,11 @@
    @Autowired
    private ShopActivitiesDao shopActivitiesDao ;

    @Value("${scheduling.enabled}")
    private boolean taskSwitch;



    @Scheduled(cron = "0 */1 * * * ?")
    public boolean executeExt() {
        if (taskSwitch) {
            LogUtil.info("#开团时间超时任务处理#");
            List<ShopActivitiesGroupJoin> groupJoins = shopActivitiesGroupJoinDao.selectGroupJoinWithEnd();
            ShopActivityTimeOutQuartz timeOutQuartz = new ShopActivityTimeOutQuartz();
@@ -48,7 +45,6 @@
                        timeOutQuartz.doUnVirtualGroup(groupJoin);
                    }
                }
            }
        }
        return true;
    }