|
|
@@ -460,7 +460,8 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
|
|
|
.atZone(ZoneId.systemDefault()).toLocalDate();
|
|
|
level.setZeroDays(ChronoUnit.DAYS.between(LocalDate.now(), upgradeCycleStartDate));
|
|
|
}
|
|
|
- boolean verified = ruleService.verifyUpgradeConditions(partnerUser.getUserId(), String.valueOf(partnerUser.getGrade() + 1));
|
|
|
+ String value = String.valueOf(partnerUser.getGrade());
|
|
|
+ boolean verified = ruleService.verifyUpgradeConditions(partnerUser.getUserId(),value);
|
|
|
if (verified) {
|
|
|
level.setUpgrade(true);
|
|
|
}
|
|
|
@@ -899,8 +900,8 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
|
|
|
public AppUserInfoVo getUserInfo(Integer type) {
|
|
|
String userId = BaseController.getUserId();
|
|
|
AppUserInfoVo appUserInfoVo = sysUserMapper.queryByUserId(userId);
|
|
|
- Integer min = baseMapper.selectGradeIntMin(userId);
|
|
|
- appUserInfoVo.setGrade(null == min ? 4 : min);
|
|
|
+ Integer min = baseMapper.selectGradeMin(userId);
|
|
|
+ appUserInfoVo.setGrade(min);
|
|
|
PartnerUser partnerUser = baseMapper.selectOne(new LambdaQueryWrapper<>(PartnerUser.class)
|
|
|
.eq(PartnerUser::getUserId, userId)
|
|
|
.eq(PartnerUser::getGrade, min));
|