From 4c09422a45a1a7696d8d000405d357a62ae48c7a Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Mon, 24 Jul 2023 20:29:36 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=8F=91=E9=80=81=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=B6=88=E6=81=AF=EF=BC=8C=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sv/api/controller/SmsController.java | 38 ++++++++++++ .../test/java/com/sv/wx/SendMessageTest.java | 58 +++++++++++++++++++ .../api/MemberLessonTicketService.java | 2 +- 3 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 api/src/test/java/com/sv/wx/SendMessageTest.java diff --git a/api/src/main/java/com/sv/api/controller/SmsController.java b/api/src/main/java/com/sv/api/controller/SmsController.java index 450f6e0..d5e6a2d 100644 --- a/api/src/main/java/com/sv/api/controller/SmsController.java +++ b/api/src/main/java/com/sv/api/controller/SmsController.java @@ -1,11 +1,21 @@ package com.sv.api.controller; +import com.enums.VenueTypeEnum; +import com.sv.entity.Constants; +import com.sv.entity.Venue; +import com.sv.entity.VenueLesson; +import com.sv.service.api.VenueLessonService; +import com.sv.service.api.VenueService; +import com.sv.service.api.util.DateUtilCard; import com.sv.service.common.SmsService; +import com.sv.service.message.SendMsg; +import com.sv.service.message.WeiXinSendUtils; import com.ydd.framework.core.common.dto.ResponseDTO; import com.ydd.framework.core.controller.BaseApiController; import org.apache.ibatis.annotations.Param; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -50,4 +60,32 @@ public class SmsController extends BaseApiController { smsService.sendUpdatePhoneCaptcha(mobile); return ResponseDTO.ok(); } + + @Resource + VenueLessonService venueLessonService; + @Resource + VenueService venueService; + @RequestMapping(value = "/test/send/wx/message",method = RequestMethod.GET) + public String sendTestMessage() { + VenueLesson venueLesson = venueLessonService.findById(30858); + String hello = DateUtilCard.getStrFromDate(venueLesson.getDate()) + " " + venueLesson.getStartTime().toString() + "-" + venueLesson.getEndTime().toString(); + System.out.println(hello); + + String openId = "o81UzwYksMMqbNJgsOvyjhbk-7b0"; + Integer venueId = venueLesson.getVenueId(); + Venue venue = venueService.findById(venueId); + String lessonTime = DateUtilCard.getStrFromDate(venueLesson.getDate()) + " " + venueLesson.getStartTime().toString(); + System.out.println(lessonTime); + String typeName = VenueTypeEnum.getByValue(venue.getType()).name; + String url = Constants.VENUE_VIEW_URL + venueId; + SendMsg sendMsg = new SendMsg(venue.getName(),venueLesson.getName(),lessonTime,typeName,url); + if (!StringUtils.isEmpty(openId)) { + String[] split = openId.split(","); + for (String s : split) { + WeiXinSendUtils.sendCard(sendMsg,s); + } + } + return "OK"; + } + } diff --git a/api/src/test/java/com/sv/wx/SendMessageTest.java b/api/src/test/java/com/sv/wx/SendMessageTest.java new file mode 100644 index 0000000..2d06757 --- /dev/null +++ b/api/src/test/java/com/sv/wx/SendMessageTest.java @@ -0,0 +1,58 @@ +package com.sv.wx; + +import com.WeiXinApplication; +import com.enums.VenueTypeEnum; +import com.sv.entity.Constants; +import com.sv.entity.Venue; +import com.sv.entity.VenueLesson; +import com.sv.service.api.VenueLessonService; +import com.sv.service.api.VenueService; +import com.sv.service.api.util.DateUtilCard; +import com.sv.service.message.SendMsg; +import com.sv.service.message.WeiXinSendUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.util.StringUtils; + +import javax.annotation.Resource; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes={WeiXinApplication.class}) +public class SendMessageTest { + + @Resource + VenueLessonService venueLessonService; + @Resource + VenueService venueService; + + @Test + public void testTask(){ + VenueLesson venueLesson = venueLessonService.findById(30858); + String hello = DateUtilCard.getStrFromDate(venueLesson.getDate()) + " " + venueLesson.getStartTime().toString() + "-" + venueLesson.getEndTime().toString(); + System.out.println(hello); + + String openId = "o81UzwYksMMqbNJgsOvyjhbk-7b0"; + Integer venueId = venueLesson.getVenueId(); + Venue venue = venueService.findById(venueId); + if (venue == null) { + return; + } + if (venueLesson == null) { + return; + } + String lessonTime = DateUtilCard.getStrFromDate(venueLesson.getDate()) + " " + venueLesson.getStartTime().toString(); + System.out.println(lessonTime); + String typeName = VenueTypeEnum.getByValue(venue.getType()).name; + String url = Constants.VENUE_VIEW_URL + venueId; + SendMsg sendMsg = new SendMsg(venue.getName(),venueLesson.getName(),lessonTime,typeName,url); + if (!StringUtils.isEmpty(openId)) { + String[] split = openId.split(","); + for (String s : split) { + WeiXinSendUtils.sendCard(sendMsg,s); + } + } + } + +} diff --git a/service/src/main/java/com/sv/service/api/MemberLessonTicketService.java b/service/src/main/java/com/sv/service/api/MemberLessonTicketService.java index fcdfe24..382935a 100644 --- a/service/src/main/java/com/sv/service/api/MemberLessonTicketService.java +++ b/service/src/main/java/com/sv/service/api/MemberLessonTicketService.java @@ -400,7 +400,7 @@ public class MemberLessonTicketService extends BaseServiceImpl { if (venueLesson == null) { return; } - String lessonTime = DateUtilCard.getStrFromDate(venueLesson.getDate()) + " " + venueLesson.getStartTime().toString() + "-" + venueLesson.getEndTime().toString(); + String lessonTime = DateUtilCard.getStrFromDate(venueLesson.getDate()) + " " + venueLesson.getStartTime().toString(); String typeName = VenueTypeEnum.getByValue(venue.getType()).name; String url = Constants.VENUE_VIEW_URL + venueId; AsyncTaskUtil.INSTANCE.submit(new NotifyAdminMsgThread(venue.getName(),venueLesson.getName(),lessonTime,typeName,url));