From 129e68b2020eaea7d6c6d2b458d008fb315eff84 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Wed, 20 Mar 2024 18:30:58 +0800
Subject: [PATCH] updates

---
 .../modules/yx/service/impl/YxVolunteerServiceImpl.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java
index 797cf7d..366bd35 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java
@@ -13,6 +13,8 @@ import org.jeecg.common.util.AssertUtils;
 import org.jeecg.modules.art.dto.RecommendMajorDTO;
 import org.jeecg.modules.art.vo.SaveVolunteerRecordVO;
 import org.jeecg.modules.art.vo.SaveVolunteerVO;
+import org.jeecg.modules.mini.dto.VipDTO;
+import org.jeecg.modules.mini.service.MiniUserService;
 import org.jeecg.modules.yx.constant.YxConstant;
 import org.jeecg.modules.yx.dto.VolunteerDTO;
 import org.jeecg.modules.yx.dto.VolunteerRecordDTO;
@@ -50,6 +52,8 @@ public class YxVolunteerServiceImpl extends ServiceImpl<YxVolunteerMapper, YxVol
     private IYxVolunteerRecordService yxVolunteerRecordService;
     @Resource
     private IYxHistoryMajorEnrollService yxHistoryMajorEnrollService;
+    @Resource
+    private MiniUserService miniUserService;
 
     final static BigDecimal bigDecimal100 = new BigDecimal("100");//100倍率
 
@@ -159,6 +163,11 @@ public class YxVolunteerServiceImpl extends ServiceImpl<YxVolunteerMapper, YxVol
         //获取已填报的志愿单
         List<VolunteerRecordDTO> recordDTOList = yxVolunteerRecordService.listDTOByVolunteerId(userScore.getId(),userScore.getCalculationTableName(),volunteer.getId());
         //获取上一年的招生人数
+        VipDTO userVip = miniUserService.getUserVip(userScore.getCreateBy());
+        if (userVip==null || userVip.getVipLevel()==null || userVip.getVipLevel()<2) {
+            recordDTOList.forEach(r->r.setEnrollProbability(new BigDecimal(0)));
+        }
+
         yxHistoryMajorEnrollService.volunteerRecordDTOListSetHistoryInfo(recordDTOList);
         //填报志愿明细信息-提前批
         List<VolunteerRecordDTO> volunteerRecordEarlyAdmissionList = recordDTOList.stream().filter(r -> r.getBatch().equals("提前批")).collect(Collectors.toList());