11.6

nickchange

2023-11-09 c036557db88c6297b9a626a892dce35c14ab8ee5

 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java

@@ -11,6 +11,7 @@
import com.dsh.competition.entity.UserCompetition;
import com.dsh.competition.feignclient.account.AppUserClient;
import com.dsh.competition.feignclient.account.model.AppUser;
import com.dsh.competition.feignclient.course.CoursePackagePaymentClient;
import com.dsh.competition.feignclient.model.*;
import com.dsh.competition.model.*;
import com.dsh.competition.service.CompetitionService;
@@ -25,9 +26,11 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;

import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
@@ -72,7 +75,36 @@
    @Autowired
    private AppUserClient appUserClient;

    /**
     * 根据门店ids 获取对应的赛事 根据赛事支付记录获取用户ids
     */
    @ResponseBody
    @PostMapping("/base/competition/getUserIds")
    public List<Integer> getUserIds(@RequestBody ListQuery query){
        List<Competition> list = cttService.list(new QueryWrapper<Competition>());
        // 赛事id集合
        List<Integer> comIds = new ArrayList<>();

        for (Integer id : query.getIds()) {
            for (Competition competition : list) {
                if (competition.getStoreId().contains(id.toString())){
                    comIds.add(competition.getId());
                }
            }
        }
        // 获取到赛事id集合 去重
        List<Integer> collect = comIds.stream().distinct().collect(Collectors.toList());
        // 根据赛事id 查询赛事支付记录 获取用户ids
        if (collect.size() == 0){
            return new ArrayList<>();
        }else{
            List<Integer> userIds = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
                    .in("competitionId", collect)).stream()
                    .map(PaymentCompetition::getAppUserId).collect(Collectors.toList());
            return userIds;
        }

    }
    /**
     * 获取赛事报名记录
     */
@@ -201,6 +233,38 @@
    }


    @PostMapping("/base/competition/getCompetitionsDetails1")
    public List<PurchaseRecordVo> getStuSourseList1(@RequestBody GetStuSourseList sourseList){

        List<PurchaseRecordVo> recordVos = new ArrayList<>();

        ArrayList<Integer> integers = new ArrayList<>();
        integers.add(4);
        List<PaymentCompetition> list = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
                .in("payType",integers )
                .eq("appUserId", sourseList.getAppUserId())
                .eq("state",1));
        if (list.size() > 0){
            List<Long> comIds = list.stream().map(PaymentCompetition::getId).collect(Collectors.toList());
            List<UserCompetition> userCompetitions = ucttService.list(new QueryWrapper<UserCompetition>()
                    .between("insertTime", sourseList.getStartTime(),sourseList.getEndTime() )
                    .eq("appUserId", sourseList.getAppUserId())
                    .in("paymentCompetitionId",comIds ));
            if (userCompetitions.size() > 0){
                userCompetitions.forEach(coms ->{
                    PurchaseRecordVo recordVo = new PurchaseRecordVo();
                    recordVo.setPurchaseType("报名赛事");
                    recordVo.setPurchaseTime(dateFormat.format(coms.getInsertTime()));
                    PaymentCompetition paymentCompetition = paymentCompetitionService.getById(coms.getPaymentCompetitionId());
                    recordVo.setPurchaseAmount("-"+paymentCompetition.getAmount());
                    recordVos.add(recordVo);
                });
            }
        }

        return recordVos;
    }




@@ -217,7 +281,11 @@
    public ResultUtil<List<CompetitionListVo>> queryCompetitionList(String cityCode, String content, Integer registerCondition, String heat){
        try {
            List<CompetitionListVo> competitionListVos = cttService.queryCompetitionList(cityCode, content, registerCondition, heat);
            return ResultUtil.success(competitionListVos);
            List<CompetitionListVo> filteredList = competitionListVos.stream()
                    .filter(vo -> vo.getStatus() == 1 || vo.getStatus() == 2)
                    .collect(Collectors.toList());

            return ResultUtil.success(filteredList);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
@@ -242,6 +310,19 @@
                return ResultUtil.tokenErr();
            }
            CompetitionInfo competitionInfo = cttService.queryCompetitionInfo(uid, id, lon, lat);


            String dateString = competitionInfo.getRegisterEndTime();
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
            Date date = sdf.parse(dateString);
            if (new Date().after(date)){
                competitionInfo.setHasPass(1);
            }else {
                competitionInfo.setHasPass(0);

            }


            return ResultUtil.success(competitionInfo);
        }catch (Exception e){
            e.printStackTrace();
@@ -254,6 +335,9 @@

    @Autowired
    private CompetitionService competitionService;
    @Resource
    private  CoursePackagePaymentClient coursePackagePaymentClient;


    @ResponseBody
    @PostMapping("/api/competition/paymentCompetition")
@@ -262,30 +346,39 @@
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")

    })
    public ResultUtil paymentCompetition(PaymentCompetitionVo paymentCompetitionVo){

    public synchronized ResultUtil paymentCompetition(PaymentCompetitionVo paymentCompetitionVo){
        try {


            Competition byId = competitionService.getById(paymentCompetitionVo.getId());
            Date date = byId.getEndTime(); // Assuming you have a Date object

            Date date = byId.getEndTime();
            // Assuming you have a Date object
            // Check if the date is past the current time
            boolean isPast = date.after(new Date());

            if (!isPast) {
                return new ResultUtil(0,"已超过截至报名时间");
            }




            Integer uid = tokenUtil.getUserIdFormRedis();
            if(null == uid){
                return ResultUtil.tokenErr();
            }



            if (byId.getRegisterCondition()==3){
             Integer counts =    coursePackagePaymentClient.isHave(paymentCompetitionVo.getIds());
                if (counts==0){
                    return new ResultUtil(0,"当前赛事仅限已购课学员报名");
                }
            }
            if (byId.getRegisterCondition()==2){
                AppUser appUser = appUserClient.queryAppUser(uid);
                if (appUser.getIsVip()==0){
                    return new ResultUtil(0,"当前赛事仅限年度会员报名");
                }else {
                    Date vipEndTime = appUser.getVipEndTime();
                    Date currentTime = new Date(); // Current time
                    if (vipEndTime.before(currentTime)) {
                        return new ResultUtil(0,"您的年度会员已过期，请续费");
                    }
                }
            }
            return cttService.paymentCompetition(uid, paymentCompetitionVo);
        }catch (Exception e){
            e.printStackTrace();
@@ -518,15 +611,14 @@
                wrapper.like(Competition::getName,listQuery.getEventName());
            }
            if(ToolUtil.isNotEmpty(listQuery.getTime())){
                wrapper.gt(Competition::getStartTime,listQuery.getTime().split(" - ")[0]+" 00:00:00");
                wrapper.lt(Competition::getEndTime,listQuery.getTime().split(" - ")[1]+" 23:59:59");
                wrapper.lt(Competition::getStartTime,listQuery.getTime().split(" - ")[0]+" 00:00:00");
                wrapper.gt(Competition::getEndTime,listQuery.getTime().split(" - ")[1]+" 23:59:59");
            }
            if(ToolUtil.isNotEmpty(listQuery.getState())){
                wrapper.eq(Competition::getStatus,listQuery.getState());
            }

            if(ToolUtil.isNotEmpty(listQuery.getRegisterCondition())){
                wrapper.eq(Competition::getRegisterCondition,listQuery.getRegisterCondition());
            }

            wrapper.in(Competition::getStoreId,listQuery.getIds());
            wrapper.eq(Competition::getAuditStatus,2);
            wrapper.orderByDesc(Competition::getInsertTime);
@@ -547,7 +639,7 @@
                wrapper.eq(Competition::getProvinceCode,listQuery.getProvinceCode());
            }
            if(ToolUtil.isNotEmpty(listQuery.getCityCode())){
                wrapper.eq(Competition::getProvinceCode,listQuery.getCityCode());
                wrapper.eq(Competition::getCityCode,listQuery.getCityCode());
            }
            if(ToolUtil.isNotEmpty(listQuery.getEventName())){
                wrapper.like(Competition::getName,listQuery.getEventName());