Commit 2d210fbb9076a5598b91f243c8786463ab42428f
1 parent
5e1c2622
修改直播申请审核通过后邮件发送的标题
直播申请审核的列表和详情页增加直播类型展示
Showing
4 changed files
with
20 additions
and
2 deletions
src/main/java/com/cnlive/shenhe/job/LiveApplyJob.java
| ... | ... | @@ -7,6 +7,7 @@ import com.cnlive.shenhe.entity.ShyChannel; |
| 7 | 7 | import com.cnlive.shenhe.entity.ShyComments; |
| 8 | 8 | import com.cnlive.shenhe.entity.ShyEmail; |
| 9 | 9 | import com.cnlive.shenhe.entity.ShyLiveapply; |
| 10 | +import com.cnlive.shenhe.entity.ShySites; | |
| 10 | 11 | import com.cnlive.shenhe.entity.ShyVideos; |
| 11 | 12 | import com.cnlive.shenhe.mapper.ShyLiveapplyMapper; |
| 12 | 13 | import com.cnlive.shenhe.serviceImpl.ChannelServiceImpl; |
| ... | ... | @@ -98,13 +99,18 @@ public class LiveApplyJob { |
| 98 | 99 | for(ShyLiveapply liveApply : shyLiveApplyList){ |
| 99 | 100 | Integer notice_state = liveApply.getEmail_notice_state();//初始化通知状态 |
| 100 | 101 | String notice_msg = liveApply.getEmail_notice_msg();//初始化通知消息 |
| 102 | + //显示spid简称 | |
| 103 | + ShySites shySites = sitesService.findspidDescByspid(liveApply.getSp_id()); | |
| 104 | + if (CommonUtils.isNotNull(shySites)) { | |
| 105 | + liveApply.setSpid_desc(shySites.getName()); | |
| 106 | + } | |
| 101 | 107 | for(ShyEmail shyEmail:shyEmailList){//循环需要发送邮件的邮箱 |
| 102 | 108 | String startTime=CommonUtils.formatDate(liveApply.getPre_start_time(), "yyyy-MM-dd HH:mm:ss"); |
| 103 | 109 | String endTime=CommonUtils.isNotNull(liveApply.getPre_end_time())?CommonUtils.formatDate(liveApply.getPre_end_time(), "yyyy-MM-dd HH:mm:ss"):"待定"; |
| 104 | 110 | String content = liveApply.getSender()+"__"+liveApply.getMobile()+"__"+liveApply.getOrganization()+"__"+liveApply.getTheme()+"__"+startTime+"__"+endTime+"__"+liveApply.getLive_place()+"__"+liveApply.getPush_url()+"__"+liveApply.getPull_url(); |
| 105 | 111 | String dateTime=CommonUtils.getCurrentDate("yyyy-MM-dd HH:mm:ss");//获取一个格式化后的当前时间 |
| 106 | 112 | String emailAddr = shyEmail.getEmail(); |
| 107 | - String title = "新直播开播申请"; | |
| 113 | + String title = liveApply.getSpid_desc()+"新直播开播申请"; | |
| 108 | 114 | String templateId = "4017"; |
| 109 | 115 | Map<String, String> params = new HashMap<>(); |
| 110 | 116 | params.put("appId", app_id); | ... | ... |
src/main/resources/templates/email/email_templates.html
| ... | ... | @@ -5,7 +5,7 @@ |
| 5 | 5 | <body> |
| 6 | 6 | <div align="center" id="tabContents" class="tab-content"> |
| 7 | 7 | <span style="font-size:30px;font-weight: bold;color:#F4A460;">中国网家家直播申请单</span> |
| 8 | - <table border="1" style="background-color:#F5FFFA;width:80%;font-size:20px;" id="table"> | |
| 8 | + <table border="1" cellspacing="0" style="background-color:#F5FFFA;width:80%;font-size:20px;" id="table"> | |
| 9 | 9 | <tr align="center" valign="middle" height="40px"> |
| 10 | 10 | <td width="25%" >直播发起人</td> |
| 11 | 11 | <td width="30%" colspan="2" > | ... | ... |
src/main/resources/templates/page/liveApply.html
| ... | ... | @@ -201,6 +201,11 @@ |
| 201 | 201 | <div class="th-inner ">商务模式</div> |
| 202 | 202 | <div class="fht-cell"></div> |
| 203 | 203 | </th> |
| 204 | + <th style="text-align: center; width: 3%; " data-field="is_hot_name" | |
| 205 | + tabindex="0"> | |
| 206 | + <div class="th-inner ">直播类型</div> | |
| 207 | + <div class="fht-cell"></div> | |
| 208 | + </th> | |
| 204 | 209 | <th style="text-align: center; width: 6%; " data-field="updater" |
| 205 | 210 | tabindex="0"> |
| 206 | 211 | <div class="th-inner ">审核员</div> |
| ... | ... | @@ -252,6 +257,7 @@ |
| 252 | 257 | <td style="text-align: center; width: 3%;" |
| 253 | 258 | th:text="${liveApply.business_model=='1'?'收费':'免费'}">收费 |
| 254 | 259 | </td> |
| 260 | + <td style="text-align: center; width: 3%;" th:text="${liveApply.live_type}">直播分类</td> | |
| 255 | 261 | <td style="text-align: center; width: 6%;" th:text="${liveApply.updater}">审核员 |
| 256 | 262 | </td> |
| 257 | 263 | <td style="text-align: center; width: 3%;"> | ... | ... |
src/main/resources/templates/page/liveApplyDetail.html
| ... | ... | @@ -68,6 +68,12 @@ |
| 68 | 68 | </td> |
| 69 | 69 | </tr> |
| 70 | 70 | <tr align="center" valign="middle" height="40px"> |
| 71 | + <td >直播类型</td> | |
| 72 | + <td colspan="5"> | |
| 73 | + <span style="color:#DC143C" th:text="${shyLiveapply.live_type}">11111111111111</span> | |
| 74 | + </td> | |
| 75 | + </tr> | |
| 76 | + <tr align="center" valign="middle" height="40px"> | |
| 71 | 77 | <td >内容属性</td> |
| 72 | 78 | <td colspan="5"> |
| 73 | 79 | <input type="checkbox" style="height: 24px;width: 24px;" th:checked="${shyLiveapply.content_property==1}" disabled/> | ... | ... |