|
@@ -340,10 +340,10 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
|
|
|
@Override
|
|
|
public String updateGoodsSend(UserQueryBo bo) {
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(1L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("商品购买成功无需填写资料");
|
|
|
//查找购买后没发送消息的商品,发送购买消息
|
|
|
List<OrderGoodsVo> orderGoodsVo = iOrderGoodsService.selectOrderGoods();
|
|
|
- InformRemindVo informRemindTwoVo = informRemindService.queryById(2L);
|
|
|
+ InformRemindVo informRemindTwoVo = informRemindService.queryByName("商品购买成功需填写资料");
|
|
|
if (!CollectionUtils.isEmpty(orderGoodsVo)) {
|
|
|
for (OrderGoodsVo goodsVo : orderGoodsVo) {
|
|
|
ProfileTpVo profileTpVo = iProfileTpService.queryByGoodsId(goodsVo.getGoodsId());
|
|
@@ -354,7 +354,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(1L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setRemind("商品开通提醒");
|
|
|
informUserAddBo.setGoodsId(goodsVo.getGoodsId());
|
|
@@ -371,7 +371,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(2L);
|
|
|
+ informUserAddBo.setRemindId(informRemindTwoVo.getId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setRemind("完善报名资料通知");
|
|
|
informUserAddBo.setGoodsId(goodsVo.getGoodsId());
|
|
@@ -396,7 +396,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
- informUserAddBo.setRemindId(1L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setRemind("商品开通提醒");
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -420,7 +420,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
- informUserAddBo.setRemindId(2L);
|
|
|
+ informUserAddBo.setRemindId(informRemindTwoVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setRemind("完善报名资料通知");
|
|
|
informUserAddBo.setGoodsId(goodsVo.getGoodsId());
|
|
@@ -480,9 +480,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
List<ClassGradeUserGoodsVo> classTwentyGradeUserVos = iClassGradeUserService.sendTwentyClassGradeUser();
|
|
|
List<ClassGradeUserGoodsVo> classTenGradeUserVos = iClassGradeUserService.sendTenClassGradeUser();
|
|
|
List<ClassGradeUserGoodsVo> classFiveGradeUserVos = iClassGradeUserService.sendFiveClassGradeUser();
|
|
|
- InformRemindVo informTwentyRemindVo = informRemindService.queryById(5L);
|
|
|
- InformRemindVo informTenRemindVo = informRemindService.queryById(6L);
|
|
|
- InformRemindVo informFiveRemindVo = informRemindService.queryById(7L);
|
|
|
+ InformRemindVo informTwentyRemindVo = informRemindService.queryByName("二建继教班级有效期倒计时20天");
|
|
|
+ InformRemindVo informTenRemindVo = informRemindService.queryByName("二建继教班级有效期倒计时10天");
|
|
|
+ InformRemindVo informFiveRemindVo = informRemindService.queryByName("二建继教班级有效期倒计时5天");
|
|
|
for (ClassGradeUserGoodsVo classTwentyGradeUserVo : classTwentyGradeUserVos) {
|
|
|
String res;
|
|
|
String resEnd;
|
|
@@ -501,7 +501,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(5L);
|
|
|
+ informUserAddBo.setRemindId(informTwentyRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setRemind("您开通班级有效期还剩20天");
|
|
|
informUserAddBo.setGradeId(classTwentyGradeUserVo.getGradeId());
|
|
@@ -517,7 +517,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(5L);
|
|
|
+ informUserAddBo.setRemindId(informTwentyRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setRemind("考试提醒");
|
|
|
informUserAddBo.setGoodsId(classTwentyGradeUserVo.getGoodsId());
|
|
@@ -553,7 +553,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(6L);
|
|
|
+ informUserAddBo.setRemindId(informTenRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setRemind("您开通班级有效期还剩10天");
|
|
|
informUserAddBo.setGradeId(classTenGradeUserVo.getGradeId());
|
|
@@ -569,7 +569,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(6L);
|
|
|
+ informUserAddBo.setRemindId(informTenRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setRemind("您开通班级有效期还剩10天");
|
|
|
informUserAddBo.setGoodsId(classTenGradeUserVo.getGoodsId());
|
|
@@ -606,7 +606,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(7L);
|
|
|
+ informUserAddBo.setRemindId(informFiveRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setRemind("您开通班级有效期还剩5天");
|
|
|
informUserAddBo.setGradeId(classFiveGradeUserVo.getGradeId());
|
|
@@ -622,7 +622,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(7L);
|
|
|
+ informUserAddBo.setRemindId(informFiveRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setRemind("您开通班级有效期还剩5天");
|
|
|
informUserAddBo.setGoodsId(classFiveGradeUserVo.getGoodsId());
|
|
@@ -646,7 +646,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
public void timeSend(UserQueryBo bo) {
|
|
|
//提醒考试
|
|
|
List<UserSubscribeVo> userSubscribeVo = iUserSubscribeService.timeSend();
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(16L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("七大员新考考试提醒");
|
|
|
for (UserSubscribeVo subscribeVo : userSubscribeVo) {
|
|
|
String seatTxt =Validator.isNotEmpty(subscribeVo.getSeatNumber())?",座位号:"+subscribeVo.getSeatNumber():"";
|
|
|
String res;
|
|
@@ -663,7 +663,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(16L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setRemind("考试提醒");
|
|
|
informUserAddBo.setGoodsId(subscribeVo.getGoodsId());
|
|
@@ -680,7 +680,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(16L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setRemind("考试提醒");
|
|
|
informUserAddBo.setGoodsId(subscribeVo.getGoodsId());
|
|
@@ -704,7 +704,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(16L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(4);
|
|
|
informUserAddBo.setRemind("考试提醒");
|
|
|
informUserAddBo.setGoodsId(subscribeVo.getGoodsId());
|
|
@@ -736,7 +736,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
public void signTimeSend(UserQueryBo bo) {
|
|
|
//提醒签署承诺书
|
|
|
List<UserSubscribeVo> userSubscribeVo = iUserSubscribeService.signTimeSend();
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(34L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("签署承诺书提醒");
|
|
|
for (UserSubscribeVo subscribeVo : userSubscribeVo) {
|
|
|
String dateStartStr = DateUtils.timestampToDate(subscribeVo.getApplySiteExamTime())+" "+subscribeVo.getApplySiteStartTime();
|
|
|
Long startTime = DateUtils.dateTimeSec(dateStartStr,DateUtils.YYYY_MM_DD_HH_MM_SS);
|
|
@@ -749,7 +749,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(34L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setRemind("签署承诺书提醒");
|
|
|
informUserAddBo.setGoodsId(subscribeVo.getGoodsId());
|
|
@@ -768,7 +768,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(34L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setRemind("签署承诺书提醒");
|
|
|
informUserAddBo.setGoodsId(subscribeVo.getGoodsId());
|
|
@@ -788,7 +788,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(34L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(4);
|
|
|
informUserAddBo.setRemind("考试提醒");
|
|
|
informUserAddBo.setGoodsId(subscribeVo.getGoodsId());
|
|
@@ -824,7 +824,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
if (CollectionUtils.isEmpty(list)){
|
|
|
return;
|
|
|
}
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(41L);//学员提醒
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("每日一练未打卡");//学员提醒
|
|
|
//需要短信提醒的学员
|
|
|
Set<Long> userIds = new HashSet<>();
|
|
|
//需求提醒的商品集合
|
|
@@ -855,7 +855,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(41L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setRemind("您开通的课程今天每日一练没有打卡,请尽快去学习吧");
|
|
|
informUserAddBo.setGoodsId(subscription.getGoodsId());
|
|
@@ -874,7 +874,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(41L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(4);
|
|
|
informUserAddBo.setRemind("您开通的课程今天每日一练没有打卡,请尽快去学习吧");
|
|
|
informUserAddBo.setGoodsId(subscription.getGoodsId());
|
|
@@ -903,7 +903,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(41L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setRemind("您开通的课程今天每日一练没有打卡,请尽快去学习吧");
|
|
|
informUserAddBo.setText("今天每日一练还没有打卡,为了你的学习效果,请尽快去学习吧");
|
|
@@ -915,7 +915,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
}
|
|
|
//教务提醒
|
|
|
if (!CollectionUtils.isEmpty(recordBos)){
|
|
|
- InformRemindVo informRemindTeachVo = informRemindService.queryById(43L);//老师提醒
|
|
|
+ InformRemindVo informRemindTeachVo = informRemindService.queryByName("教务每日一练未打卡");//老师提醒
|
|
|
Map<Long, List<ExamTodayRecordBo>> map = recordBos.stream().collect(Collectors.groupingBy(ExamTodayRecordBo::getGoodsId));
|
|
|
map.forEach((k,v) -> {
|
|
|
//获取班主任信息
|
|
@@ -944,7 +944,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(43L);
|
|
|
+ informUserAddBo.setRemindId(informRemindTeachVo.getId());
|
|
|
informUserAddBo.setSystemStatus(2);
|
|
|
informUserAddBo.setRemind("学员学习提醒,请尽快处理");
|
|
|
informUserAddBo.setGoodsId(k);
|
|
@@ -963,7 +963,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(43L);
|
|
|
+ informUserAddBo.setRemindId(informRemindTeachVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setRemind("学员学习提醒,请尽快处理");
|
|
|
informUserAddBo.setText("有"+v.size()+"个学员,开通《"+goods.getGoodsName()+"》今天每日一练还没有打卡,请后台查看未打卡学员信息,尽快与学员沟通");
|
|
@@ -1638,7 +1638,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
private void sendExamSubscribe() {
|
|
|
List<ExamUserApplyVo> examUserApplyVos = iInformUserService.listUserApply();
|
|
|
for (ExamUserApplyVo examUserApplyVo : examUserApplyVos) {
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(13L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("七大员新考考试预约提醒");
|
|
|
String res;
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
Long timeId = examUserApplyVo.getApplyEndTime() * 1000;
|
|
@@ -1651,7 +1651,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(13L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setRemind("考试预约提醒");
|
|
|
informUserAddBo.setGoodsId(examUserApplyVo.getGoodsId());
|
|
@@ -1667,7 +1667,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(13L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setRemind("考试预约提醒");
|
|
|
informUserAddBo.setGoodsId(examUserApplyVo.getGoodsId());
|
|
@@ -1689,7 +1689,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(13L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(4);
|
|
|
informUserAddBo.setRemind("考试预约提醒");
|
|
|
informUserAddBo.setGoodsId(examUserApplyVo.getGoodsId());
|
|
@@ -1757,7 +1757,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
mockApplyVos.forEach(mockApplyVo -> {
|
|
|
List<OrderGoodsVo> orderGoodsVoList = iOrderGoodsService.selectBuyUserList(mockApplyVo.getMockMajorSubjectId());
|
|
|
orderGoodsVoList.forEach(orderGoodsVo -> {
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(25L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("一二建考前模考报名提醒");
|
|
|
if (informRemindVo.getWayStatus().equals(1)) {
|
|
|
InformUserAddBo informUserAddBo = new InformUserAddBo();
|
|
|
informUserAddBo.setUserId(orderGoodsVo.getUserId());
|
|
@@ -1765,7 +1765,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(25L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setRemind("模考预约提醒");
|
|
|
informUserAddBo.setText("尊敬的用户:【" + mockApplyVo.getBusinessName() + mockApplyVo.getProjectName() + "】考前模拟考试将开始报名参加模拟考试。请登录【祥粤云小程序】或【web.xyyxt.net】进行报名。");
|
|
@@ -1778,7 +1778,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(25L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setRemind("模考预约提醒");
|
|
|
informUserAddBo.setText("尊敬的用户:【" + mockApplyVo.getBusinessName() + mockApplyVo.getProjectName() + "】考前模拟考试将开始报名参加模拟考试。请登录【祥粤云小程序】或【web.xyyxt.net】进行报名。");
|
|
@@ -1817,7 +1817,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
}
|
|
|
return true;
|
|
|
});
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(26L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("一二建考前模考开考前一小时提醒");
|
|
|
if (userMockSubscribeList != null && userMockSubscribeList.size() > 0) {
|
|
|
for (UserMockSubscribe subscribeVo : userMockSubscribeList) {
|
|
|
LambdaQueryWrapper<MockMajorSubjectTime> lqw2 = Wrappers.lambdaQuery();
|
|
@@ -1844,7 +1844,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(26L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setRemind("模考提醒");
|
|
|
informUserAddBo.setText("祥粤云学堂提醒:您学习【" + courseSubject.getSubjectName() + "】科目中的【" + mockApply.getApplyName() + "模考】已将于60分钟后开始考试,请及时在【祥粤云小程序】或【web.xyyxt.net】进行考试。");
|
|
@@ -1858,7 +1858,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(26L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setRemind("模考提醒");
|
|
|
informUserAddBo.setText("祥粤云学堂提醒:您学习【" + courseSubject.getSubjectName() + "】科目中的【" + mockApply.getApplyName() + "模考】已将于60分钟后开始考试,请及时在【祥粤云小程序】或【web.xyyxt.net】进行考试。");
|
|
@@ -1879,7 +1879,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
List<UserMockSubscribeVo> userMockSubscribeVoList = iUserMockSubscribeService.listLiveSubscribe();
|
|
|
userMockSubscribeVoList.removeIf(userMockSubscribeVo -> System.currentTimeMillis()/1000 + 3600 <= userMockSubscribeVo.getLiveStartTime());
|
|
|
for (UserMockSubscribeVo userMockSubscribeVo : userMockSubscribeVoList) {
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(27L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("一二建考前直播前一小时提醒");
|
|
|
if (userMockSubscribeVo.getLiveSubscribe() == 1) {
|
|
|
if (informRemindVo.getWayStatus().equals(1)) {
|
|
|
InformUserAddBo informUserAddBo = new InformUserAddBo();
|
|
@@ -1888,7 +1888,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(27L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setRemind("直播开课提醒");
|
|
|
informUserAddBo.setText("祥粤云学堂提醒:您学习【" + userMockSubscribeVo.getSubjectName() + "】科目中的【" + userMockSubscribeVo.getName() + "直播】已将于60分钟后开始直播,请及时在【祥粤云小程序】或【web.xyyxt.net】进行观看。");
|
|
@@ -1902,7 +1902,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendStatus(1);
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(27L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setRemind("直播开课提醒");
|
|
|
informUserAddBo.setText("祥粤云学堂提醒:您学习【" + userMockSubscribeVo.getSubjectName() + "】科目中的【" + userMockSubscribeVo.getName() + "直播】已将于60分钟后开始直播,请及时在【祥粤云小程序】或【web.xyyxt.net】进行观看。");
|
|
@@ -1937,7 +1937,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
queryBo2.setStartTime(startTime);
|
|
|
queryBo2.setEndTime(endTime);
|
|
|
List<OrderGoodsVo> list2 = iOrderGoodsService.getBuyNotStudyList(queryBo2);
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(28L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("已开通商品课程2天后学员未上课");
|
|
|
for(OrderGoodsVo goodsVo : list2){
|
|
|
GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
|
|
|
if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
|
|
@@ -1949,7 +1949,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(28L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -1965,7 +1965,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(28L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
@@ -1987,7 +1987,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
- informUserAddBo.setRemindId(28L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(4);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
|
informUserAddBo.setRemind("您新开通的课程已有2天,尽快去学习吧");
|
|
@@ -2021,7 +2021,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
queryBo2.setStartTime(startTime);
|
|
|
queryBo2.setEndTime(endTime);
|
|
|
List<OrderGoodsVo> list2 = iOrderGoodsService.getBuyNotStudyList(queryBo2);
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(29L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("已开通商品课程5天后学员未上课");
|
|
|
for(OrderGoodsVo goodsVo : list2){
|
|
|
GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
|
|
|
if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
|
|
@@ -2033,7 +2033,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(29L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2049,7 +2049,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(29L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2070,7 +2070,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(29L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(4);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2105,7 +2105,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
queryBo2.setStartTime(startTime);
|
|
|
queryBo2.setEndTime(endTime);
|
|
|
List<OrderGoodsVo> list2 = iOrderGoodsService.getBuyNotStudyList(queryBo2);
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(35L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("已开通商品课程15天后学员未上课");
|
|
|
for(OrderGoodsVo goodsVo : list2){
|
|
|
GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
|
|
|
if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
|
|
@@ -2117,7 +2117,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(35L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2133,7 +2133,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(35L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2154,7 +2154,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(35L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(4);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2189,7 +2189,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
queryBo2.setStartTime(startTime);
|
|
|
queryBo2.setEndTime(endTime);
|
|
|
List<OrderGoodsVo> list2 = iOrderGoodsService.getBuyNotStudyList(queryBo2);
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(36L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("已开通商品课程30天后学员未上课");
|
|
|
for(OrderGoodsVo goodsVo : list2){
|
|
|
GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
|
|
|
if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
|
|
@@ -2201,7 +2201,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(36L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2217,7 +2217,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(36L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2238,7 +2238,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(36L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(4);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2273,7 +2273,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
queryBo2.setStartTime(startTime);
|
|
|
queryBo2.setEndTime(endTime);
|
|
|
List<OrderGoodsVo> list2 = iOrderGoodsService.getBuyNotStudyList(queryBo2);
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(37L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("已开通商品课程55天后学员未上课");
|
|
|
for(OrderGoodsVo goodsVo : list2){
|
|
|
GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
|
|
|
if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
|
|
@@ -2285,7 +2285,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(37L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2301,7 +2301,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(37L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2322,7 +2322,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(37L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(4);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2357,7 +2357,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
queryBo2.setStartTime(startTime);
|
|
|
queryBo2.setEndTime(endTime);
|
|
|
List<OrderGoodsVo> list2 = iOrderGoodsService.getBuyNotStudyList(queryBo2);
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(30L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("已开通商品课程7天后学员未上课");
|
|
|
for(OrderGoodsVo goodsVo : list2){
|
|
|
if(Validator.isEmpty(goodsVo.getSysUserId())){
|
|
|
continue;
|
|
@@ -2373,7 +2373,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(30L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2390,7 +2390,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(30L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2426,7 +2426,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
queryBo2.setStartTime(startTime);
|
|
|
queryBo2.setEndTime(endTime);
|
|
|
List<OrderGoodsVo> list2 = iOrderGoodsService.getBuyNotStudyList(queryBo2);
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(38L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("近15天学员没有学习");
|
|
|
for(OrderGoodsVo goodsVo : list2){
|
|
|
if(Validator.isEmpty(goodsVo.getSysUserId())){
|
|
|
continue;
|
|
@@ -2442,7 +2442,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(38L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2459,7 +2459,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(38L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2495,7 +2495,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
queryBo2.setStartTime(startTime);
|
|
|
queryBo2.setEndTime(endTime);
|
|
|
List<OrderGoodsVo> list2 = iOrderGoodsService.getBuyNotStudyList(queryBo2);
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(39L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("近30天学员没有学习");
|
|
|
for(OrderGoodsVo goodsVo : list2){
|
|
|
if(Validator.isEmpty(goodsVo.getSysUserId())){
|
|
|
continue;
|
|
@@ -2511,7 +2511,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(39L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2528,7 +2528,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(39L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2564,7 +2564,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
queryBo2.setStartTime(startTime);
|
|
|
queryBo2.setEndTime(endTime);
|
|
|
List<OrderGoodsVo> list2 = iOrderGoodsService.getBuyNotStudyList(queryBo2);
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(39L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("近55天学员没有学习");
|
|
|
for(OrderGoodsVo goodsVo : list2){
|
|
|
if(Validator.isEmpty(goodsVo.getSysUserId())){
|
|
|
continue;
|
|
@@ -2580,7 +2580,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(40L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2597,7 +2597,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(40L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2633,7 +2633,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
queryBo2.setStartTime(startTime);
|
|
|
queryBo2.setEndTime(endTime);
|
|
|
List<OrderGoodsVo> list2 = iOrderGoodsService.getLongNotStudyList(queryBo2);
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(31L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("近3天学员没有学习");
|
|
|
for(OrderGoodsVo goodsVo : list2){
|
|
|
GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
|
|
|
if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
|
|
@@ -2645,7 +2645,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(31L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2661,7 +2661,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(31L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2682,7 +2682,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(31L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(4);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2716,7 +2716,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
queryBo2.setStartTime(startTime);
|
|
|
queryBo2.setEndTime(endTime);
|
|
|
List<OrderGoodsVo> list2 = iOrderGoodsService.getLongNotStudyList(queryBo2);
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(32L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("近5天学员没有学习");
|
|
|
for(OrderGoodsVo goodsVo : list2){
|
|
|
GoodsVo goods = iGoodsService.queryById(goodsVo.getGoodsId());
|
|
|
if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
|
|
@@ -2728,7 +2728,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(32L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2744,7 +2744,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(32L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2765,7 +2765,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(32L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setSystemStatus(4);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
|
informUserAddBo.setRemind("您已超过5天没有学习课程,尽快去学习吧");
|
|
@@ -2799,7 +2799,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
queryBo2.setStartTime(startTime);
|
|
|
queryBo2.setEndTime(endTime);
|
|
|
List<OrderGoodsVo> list2 = iOrderGoodsService.getLongNotStudyList(queryBo2);
|
|
|
- InformRemindVo informRemindVo = informRemindService.queryById(33L);
|
|
|
+ InformRemindVo informRemindVo = informRemindService.queryByName("近7天学员没有学习");
|
|
|
for(OrderGoodsVo goodsVo : list2){
|
|
|
if(Validator.isEmpty(goodsVo.getSysUserId())){
|
|
|
continue;
|
|
@@ -2815,7 +2815,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(33L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(1);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
@@ -2832,7 +2832,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
|
|
|
informUserAddBo.setSendTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setCreateTime(DateUtils.getNowTime());
|
|
|
informUserAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
|
- informUserAddBo.setRemindId(33L);
|
|
|
+ informUserAddBo.setRemindId(informRemindVo.getId());
|
|
|
informUserAddBo.setGradeId(goodsVo.getGradeId());
|
|
|
informUserAddBo.setSystemStatus(3);
|
|
|
informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|