修改邮箱状态

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/dto/MarketingCampaignDTO.java

@@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.storlead.framework.mybatis.page.Page;
 
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -88,8 +89,11 @@ public class MarketingCampaignDTO extends Page {
     private String emailAddress;
 
     @ApiModelProperty(value = "发送时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @TableField("email_sent_time")
-    private String emailSentTime;
+    private Date emailSentTime;
 
     @ApiModelProperty(value = "邮件模板")
     @TableField("email_template")

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/entity/MarketingCampaignEntity.java

@@ -12,6 +12,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
+import java.util.Date;
 
 @Data
 @TableName("marketing_campaign")
@@ -83,8 +84,11 @@ public class MarketingCampaignEntity extends SysBaseField {
     private String emailAddress;
 
     @ApiModelProperty(value = "发送时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @TableField("email_sent_time")
-    private String emailSentTime;
+    private Date emailSentTime;
 
     @ApiModelProperty(value = "邮件模板")
     @TableField("email_template")

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/MarketingCampaignServiceImpl.java

@@ -230,10 +230,6 @@ public class MarketingCampaignServiceImpl
         BeanUtils.copyProperties(marketingCampaignDTO, marketingCampaignEntity);
         // supervisorList 转为逗号分隔字符串
         marketingCampaignEntity.setSupervisor(joinSupervisorList(marketingCampaignDTO));
-        // 过滤 AI 最优时间占位值，避免写入 DATETIME 列报错
-        if ("optimal".equalsIgnoreCase(marketingCampaignEntity.getEmailSentTime())) {
-            marketingCampaignEntity.setEmailSentTime(null);
-        }
         boolean isOk = this.save(marketingCampaignEntity);
         if (!isOk) {
 
@@ -296,10 +292,6 @@ public class MarketingCampaignServiceImpl
         BeanUtils.copyProperties(marketingCampaignDTO, marketingCampaignEntity);
         // supervisorList 转为逗号分隔字符串
         marketingCampaignEntity.setSupervisor(joinSupervisorList(marketingCampaignDTO));
-        // 过滤 AI 最优时间占位值，避免写入 DATETIME 列报错
-        if ("optimal".equalsIgnoreCase(marketingCampaignEntity.getEmailSentTime())) {
-            marketingCampaignEntity.setEmailSentTime(null);
-        }
         boolean isOk = this.updateById(marketingCampaignEntity);
         if (!isOk) {
             return Result.error("修改失败");

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/vo/MarketingCampaignVO.java

@@ -13,6 +13,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -71,7 +72,10 @@ public class MarketingCampaignVO extends SysBaseField {
     private String emailAddress;
 
     @ApiModelProperty(value = "发送时间")
-    private String emailSentTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date emailSentTime;
 
     @ApiModelProperty(value = "邮件模板")
     private String emailTemplate;