diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java index 55b57d3fd..34e567ff4 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java @@ -3,12 +3,17 @@ package com.accompany.admin.service.api; import com.accompany.admin.mapper.api.MyApiAdminMapper; import com.accompany.admin.model.GiftSendRecordMgr; import com.accompany.business.model.Headwear; +import com.accompany.business.mybatismapper.activity.LuckySeaActMapper; import com.accompany.business.service.activities.ActNewYearFireworkService; import com.accompany.business.service.activities.valentineCp.ActValentineCpService; +import com.accompany.business.service.activities.vo.LuckySeaRankListVo; import com.accompany.business.service.clan.ClanGoldDayFlowService; import com.accompany.business.service.headwear.HeadwearService; +import com.accompany.business.service.push.EnterpriseWechatPushService; import com.accompany.business.service.room.RoomReciveRankingService; import com.accompany.business.service.room.RoomSendRankingService; +import com.accompany.common.config.WebSecurityConfig; +import com.accompany.common.push.MarkdownMessage; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; @@ -56,6 +61,12 @@ public class MyApiService { private Executor bizExecutor; @Autowired private TaskScheduler taskScheduler; + @Autowired + private LuckySeaActMapper luckySeaActMapper; + @Autowired + private EnterpriseWechatPushService enterpriseWechatPushService; + @Autowired + private WebSecurityConfig webSecurityConfig; private Map futureMap = new ConcurrentHashMap<>(); @@ -156,4 +167,30 @@ public class MyApiService { LocalDateTime now = LocalDateTime.now(); actValentineCpService.settlement(now, true); } + + public void pushLuckySeaAWechat(String date) { + Date yesterday = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); + Date beginTimeOfDay = DateTimeUtil.getBeginTimeOfDay(yesterday); + Date endTimeOfDay = DateTimeUtil.getEndTimeOfDay(yesterday); + + List rankList = luckySeaActMapper.listDiamondRank(0, 1, beginTimeOfDay, endTimeOfDay); + for (LuckySeaRankListVo vo: rankList){ + MarkdownMessage msg = new MarkdownMessage(); + msg.add(MarkdownMessage.getHeaderText(3, String.format("%s 星级厨房奖励榜榜一大佬", date))); + msg.add(MarkdownMessage.getReferenceText(String.format("平台ID [%d]", vo.getErbanNo()))); + msg.add(MarkdownMessage.getReferenceText(String.format("昵称 [%s]", vo.getNick()))); + msg.add(MarkdownMessage.getReferenceText(String.format("当日累计收礼钻石价值 [%d]", vo.getNum().longValue()))); + enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getActivityEnterpriseWechatPushKey(), msg); + } + + rankList = luckySeaActMapper.listLuckyManRank(0, 1, beginTimeOfDay, endTimeOfDay); + for (LuckySeaRankListVo vo: rankList){ + MarkdownMessage msg = new MarkdownMessage(); + msg.add(MarkdownMessage.getHeaderText(3, String.format("%s 星级厨房欧皇榜榜一大佬", date))); + msg.add(MarkdownMessage.getReferenceText(String.format("平台ID [%d]", vo.getErbanNo()))); + msg.add(MarkdownMessage.getReferenceText(String.format("昵称 [%s]", vo.getNick()))); + msg.add(MarkdownMessage.getReferenceText(String.format("当日累计收礼钻石价值 [%d]", vo.getNum().longValue()))); + enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getActivityEnterpriseWechatPushKey(), msg); + } + } } diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java index 5767179f2..578c21a7a 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java @@ -100,4 +100,14 @@ public class MyApiController { myApiService.settlementValentineCp(); return new BusiResult<>(BusiStatus.SUCCESS); } + + @RequestMapping("/pushLuckySeaWechat") + @ResponseBody + public BusiResult pushLuckySeaAWechat(Long roomId, String date) { + if (null == roomId || !roomId.equals(603L)){ + throw new ServiceException(BusiStatus.PARAMERROR); + } + myApiService.pushLuckySeaAWechat(date); + return new BusiResult<>(BusiStatus.SUCCESS); + } } diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/RankWechatTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/RankWechatTask.java index 77cb40f20..316eded24 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/RankWechatTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/RankWechatTask.java @@ -103,7 +103,7 @@ public class RankWechatTask { msg.add(MarkdownMessage.getHeaderText(3, String.format("%s 星级厨房奖励榜榜一大佬", yesterDayStr))); msg.add(MarkdownMessage.getReferenceText(String.format("平台ID [%d]", vo.getErbanNo()))); msg.add(MarkdownMessage.getReferenceText(String.format("昵称 [%s]", vo.getNick()))); - msg.add(MarkdownMessage.getReferenceText(String.format("当日累计收礼钻石价值 [%d]", vo.getNum()))); + msg.add(MarkdownMessage.getReferenceText(String.format("当日累计收礼钻石价值 [%d]", vo.getNum().longValue()))); enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getActivityEnterpriseWechatPushKey(), msg); } } @@ -118,7 +118,7 @@ public class RankWechatTask { msg.add(MarkdownMessage.getHeaderText(3, String.format("%s 星级厨房欧皇榜榜一大佬", yesterDayStr))); msg.add(MarkdownMessage.getReferenceText(String.format("平台ID [%d]", vo.getErbanNo()))); msg.add(MarkdownMessage.getReferenceText(String.format("昵称 [%s]", vo.getNick()))); - msg.add(MarkdownMessage.getReferenceText(String.format("当日累计收礼钻石价值 [%d]", vo.getNum()))); + msg.add(MarkdownMessage.getReferenceText(String.format("当日累计收礼钻石价值 [%d]", vo.getNum().longValue()))); enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getActivityEnterpriseWechatPushKey(), msg); } }