merge api_score_merge

Helius

2022-02-10 91e4d0c81321f9ccfec7fca41898a00ff6f57001

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

@@ -11,6 +11,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
@@ -98,6 +99,7 @@
     *
     * @param groupJoin
     */
    @Transactional
    public void doUnVirtualGroup(ShopActivitiesGroupJoin groupJoin) {
        LogUtil.info("#非虚拟拼团逻辑处理#");
        groupJoin.setGjStatus(ShopActivitiesGroupJoin.ACTIVITIES_JOIN_FAIL);