Revert "Revert "Revert "系统邮件加入注册时间控制"""

This reverts commit 3d563bd853.
master
lvxinran 2020-07-30 13:45:17 +08:00
parent 3d563bd853
commit 68da41c4ae
3 changed files with 4 additions and 31 deletions

View File

@ -14,8 +14,6 @@ import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@Component
@ -35,10 +33,7 @@ public class MailDaoImpl implements MailDao {
sysMail.setContent(mail.getMailContent());
sysMail.setMongoKey(mongoKey);
sysMail.setTitle(mail.getMailTitle());
Date date = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").parse(mail.getPlayerRTime());
sysMail.setRegisterEndTime(date.getTime());
sysMail.setEffectiveTime(0);//todo 要修改
sysMail.setRegisterEndTime(System.currentTimeMillis());
StringBuilder sb = new StringBuilder();
for(int i = 0 ; i <mail.getItemIds().size();i++){
sb.append(mail.getItemIds().get(i)).append("#").append(mail.getItemNums().get(i));

View File

@ -45,12 +45,6 @@ public class ServerMail {
@Field(value = "createUser")
private String createUser;//创建者
@Field(value = "playerRTime")
private String playerRTime;
@Field(value = "effectTime")
private int effectTime;
// "mailTitle": mailTitle,
// "mailContent": mailContent,
// "isAttach": isAttach,
@ -164,20 +158,4 @@ public class ServerMail {
public void setCreateUser(String createUser) {
this.createUser = createUser;
}
public String getPlayerRTime() {
return playerRTime;
}
public void setPlayerRTime(String playerRTime) {
this.playerRTime = playerRTime;
}
public int getEffectTime() {
return effectTime;
}
public void setEffectTime(int effectTime) {
this.effectTime = effectTime;
}
}

View File

@ -206,7 +206,7 @@ function sendSysMail() {
var attach = $("input[name='attach']").val();
var isAttach = document.getElementById("isAttach").value;
var sendTime = $("input[name='sendTime']").val();
var playerRTime = $("#PlayerRTime").val();
var playerRTime = $("input[name='playerRTime']").val();
var effectTime = $("input[name='effectTime']").val();
var version = $("input[name='version']").val();
var itemIds = [];
@ -259,8 +259,8 @@ function sendSysMail() {
"itemNums": itemNums,
// "itemTypes[]": itemTypes,
"sendTime": sendTime,
"playerRTime": playerRTime,
"effectTime": effectTime,
// "playerRTime": playerRTime,
// "effectTime": effectTime,
"version": version
})
,