Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

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

@@ -1,19 +1,17 @@
package com.matrix.system.shopXcx.quartz;

import com.matrix.component.tools.WxUtils;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.shopXcx.api.service.WxShopRefundRecordService;
import com.matrix.system.shopXcx.bean.*;
import com.matrix.system.shopXcx.dao.*;

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.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
@@ -25,7 +23,6 @@
 * @author wzy
 */
@Configuration
@EnableScheduling
public class ShopActivityTimeOutQuartz {

    @Autowired
@@ -41,13 +38,11 @@
    @Autowired
    private ShopActivitiesGroupJoinUserDao shopActivitiesGroupJoinUserDao;

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


    @Scheduled(cron = "0 */1 * * * ?")
    public void executeExt() {
        if (taskSwitch) {

            LogUtil.info("#拼团活动自动结束任务#");
            List<ShopActivities> actList = shopActivitiesDao.selectShopActivitiesHasEnd();
            if (CollectionUtils.isNotEmpty(actList)) {
@@ -66,7 +61,7 @@
                    }
                }
            }
        }

    }

    /**
@@ -104,6 +99,7 @@
     *
     * @param groupJoin
     */
    @Transactional
    public void doUnVirtualGroup(ShopActivitiesGroupJoin groupJoin) {
        LogUtil.info("#非虚拟拼团逻辑处理#");
        groupJoin.setGjStatus(ShopActivitiesGroupJoin.ACTIVITIES_JOIN_FAIL);
@@ -121,8 +117,8 @@
                if (joinUser.getIsHasPay() == ShopActivitiesGroupJoinUser.IS_HAS_PAY_Y) {
                    LogUtil.info("#已付款退款逻辑#");
                    ShopRefundRecord refundRecord = new ShopRefundRecord();
                    refundRecord.setCreateBy(joinUser.getUserId());
                    refundRecord.setUpdateBy(joinUser.getUserId());
                    refundRecord.setCreateBy(MatrixConstance.SYSTEM_USER);
                    refundRecord.setUpdateBy(MatrixConstance.SYSTEM_USER);
                    refundRecord.setUserId(joinUser.getUserId());
                    refundRecord.setRefundNo(WxUtils.getOrderNum());
                    refundRecord.setOrderId(joinUser.getOrderId().intValue());