修改bug

puzhibing

2024-02-28 4f3785a686441da0b7435f0b126d3748eb2fe289

修改bug

 cloud-server-communityWorldCup/src/main/java/com/dsh/CommunityWorldCupApplication.java

@@ -23,7 +23,7 @@
@EnableFeignClients
@MBCloudApplication
@Import({WebConfig.class})
@MapperScan("com.dsh.competition.mapper")
@MapperScan("com.dsh.communityWorldCup.mapper")
public class CommunityWorldCupApplication {
    public static void main(String[] args) {
        SpringApplication.run(CommunityWorldCupApplication.class, args);

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/DeductionCompetitionsClient.java

@@ -12,11 +12,5 @@
@FeignClient(value = "mb-cloud-competition")
public interface DeductionCompetitionsClient {

    @PostMapping("/base/competition/getCompetitionsDetails")
    public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList);


    @PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
    List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId);

}

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/util/TaskUtil.java

@@ -11,8 +11,6 @@
@Component
public class TaskUtil {

    @Autowired
    private CompetitionService competitionService;


    /**
@@ -21,8 +19,6 @@
    @Scheduled(fixedRate = 60000)
    public void taskMinute() {
        try {
            //定时修改赛事状态
            competitionService.taskSetStatus();
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -31,8 +27,6 @@
    @Scheduled(fixedRate = 60000)
    public void money() {
        try {
            //定时修改赛事状态
            competitionService.moneyOut();
        } catch (Exception e) {
            e.printStackTrace();
        }

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/util/TaskUtilCompetition.java

@@ -1,12 +1,8 @@
package com.dsh.communityWorldCup.util;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;

/**
 * @author shaqian
@@ -15,8 +11,6 @@
@Component
public class TaskUtilCompetition {

    @Resource
    private CompetitionService competitionService;

    /**
     * 每秒去处理的定时任务
@@ -24,22 +18,7 @@
    @Scheduled(fixedRate = 30000)
    public void taskMinute() {
        try {
            List<Competition> list = competitionService.list(new QueryWrapper<Competition>()
                    .ne("status", 4).ne("state", 3));
            for (Competition competition : list) {
                // 当前时间小于开始时间
                if (competition.getStartTime().after(new Date())) {
                    competition.setStatus(1);
                }
                if (competition.getStartTime().before(new Date())) {
                    if (competition.getEndTime().after(new Date())) {
                        competition.setStatus(2);
                    } else {
                        competition.setStatus(3);
                    }
                }
                competitionService.updateById(competition);
            }

        } catch (Exception e) {
            e.printStackTrace();
        }

 cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/PermissionsFilter.java

@@ -119,6 +119,16 @@
    @Value(("${ignore.other.uris}"))
    private String IGNORE_OTHER_URIS;
    /**
     * 世界杯
     */
    @Value(("${ignore.communityWorldCup.prefix}"))
    private String IGNORE_COMMUNITY_WORLD_CUP_PREFIX;
    /**
     * 世界杯
     */
    @Value(("${ignore.communityWorldCup.uris}"))
    private String IGNORE_COMMUNITY_WORLD_CUP_URIS;
    /**
     * 管理后台
     */
    @Value(("${ignore.management.prefix}"))
@@ -282,6 +292,18 @@
            }

        }
        //世界杯
        if (uri.startsWith(IGNORE_COMMUNITY_WORLD_CUP_PREFIX)) {
            if(!StringUtils.isEmpty(IGNORE_COMMUNITY_WORLD_CUP_URIS)){
                String[] split = IGNORE_COMMUNITY_WORLD_CUP_URIS.split(",");
                for (String s : split) {
                    if (uri.contains(s)) {
                        return PermissionResult.PASS;
                    }
                }
            }

        }


        // ----------------------------------------------------------------- 放行综合后台授权登录-UPMS

 cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java

@@ -120,6 +120,7 @@
                storeConfigVo.setBackgroundImage(worldCupStore.getBackgroundImage());
                storeConfigVo.setType(9);
                storeConfigVo.setIsOpen(worldCupStore.getIsOpen());
                storeConfigVo.setSort(worldCupStore.getSort());
                listVo.add(storeConfigVo);
            }