|
|
@@ -269,7 +269,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
|
|
|
private SysUser getSysUser() {
|
|
|
Optional<SysUser> sysUserOpt = Optional.ofNullable(sysUserFeignService.queryUserInfo());
|
|
|
- sysUserOpt.filter(s -> s.getOrganId() == 59).orElseThrow(() -> new BizException("该活动是齐齐哈尔分部专属活动"));
|
|
|
+ sysUserOpt.filter(s -> s.getOrganId() == 59).orElseThrow(() -> new BizException("该分部无此活动"));
|
|
|
SysUser sysUser = sysUserOpt.orElseThrow(() -> new BizException("未查询到学生信息，请重新登录！"));
|
|
|
sysUserOpt.map(SysUser::getId)
|
|
|
.map(studentService::getLocked)
|
|
|
@@ -400,6 +400,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
String activityDateStr = sysConfigDao.findConfigValue("qqhe_2022_buy_member_activity");
|
|
|
//获取活动时间
|
|
|
Date activityDate = DateUtil.stringToDate(activityDateStr, DateUtil.EXPANDED_DATE_TIME_FORMAT);
|
|
|
+ logger.info("orderCallback >>> member param organId {} orderTime {} activityDate {} cache {}", sysUser.getOrganId(), studentPaymentOrder.getCreateTime(), activityDate, cache.isExists());
|
|
|
//分部编号59 并且下单时间大于等于activityDateStr todo 并且redis能查询到的就算齐齐哈尔活动购买的
|
|
|
if (sysUser.getOrganId() == 59 && studentPaymentOrder.getCreateTime().after(activityDate) && cache.isExists()) {
|
|
|
//修改 cloudTeacherOrderService
|
|
|
@@ -408,7 +409,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
cloudTeacherOrder.setUpdateTime(nowDate);
|
|
|
cloudTeacherOrderService.update(cloudTeacherOrder);
|
|
|
//修改student 查询学生现在的会员过期没，如果过期了就按现在时间来，如果没过期就在结束时间上叠加
|
|
|
- if (student.getMembershipStartTime().getTime() >= nowDate.getTime()) {
|
|
|
+ if (Objects.nonNull(student.getMembershipStartTime()) && student.getMembershipStartTime().getTime() >= nowDate.getTime()) {
|
|
|
student.setMembershipEndTime(DateUtil.addMonths(student.getMembershipEndTime(), cloudTeacherOrder.getTime()));
|
|
|
} else {
|
|
|
student.setMembershipStartTime(cloudTeacherOrder.getStartTime());
|
hgw