优化

mp-common/src/main/java/com/qs/mp/common/enums/MarketingStatusEnum.java

@@ -2,8 +2,11 @@ package com.qs.mp.common.enums;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IEnum;
+import com.qs.mp.common.utils.DateUtils;
 import io.swagger.annotations.ApiModel;
 
+import java.util.Date;
+
 /**
  * 活动状态枚举类
  * @author Cup
@@ -62,4 +65,24 @@ public enum MarketingStatusEnum implements IEnum<Integer> {
         }
         return null;
     }
+
+    public static String getStatus(Date startTime, Date endTime, Integer isOn) {
+        if (MarketingStatusEnum.OFF.getValue().equals(isOn)) {
+            return MarketingStatusEnum.OFF.toString();
+        }
+        if (MarketingStatusEnum.CLOSE.getValue().equals(isOn)) {
+            return MarketingStatusEnum.CLOSE.toString();
+        }
+
+        Date now = DateUtils.getNowDate();
+        if (now.before(startTime)) {
+            return MarketingStatusEnum.UNSTART.toString();
+        }
+
+        if (now.after(endTime)) {
+            return MarketingStatusEnum.END.toString();
+        }
+
+        return MarketingStatusEnum.START.toString();
+    }
 }

mp-service/src/main/java/com/qs/mp/admin/domain/vo/MarketingListVO.java

@@ -45,24 +45,7 @@ public class MarketingListVO {
     private String status;
 
     public String getStatus() {
-
-        if (MarketingStatusEnum.OFF.getValue().equals(this.isOn)) {
-            return MarketingStatusEnum.OFF.toString();
-        }
-        if (MarketingStatusEnum.CLOSE.getValue().equals(this.isOn)) {
-            return MarketingStatusEnum.CLOSE.toString();
-        }
-
-        Date now = DateUtils.getNowDate();
-        if (now.before(this.startTime)) {
-            return MarketingStatusEnum.UNSTART.toString();
-        }
-
-        if (now.after(this.endTime)) {
-            return MarketingStatusEnum.END.toString();
-        }
-
-        return MarketingStatusEnum.START.toString();
+        return MarketingStatusEnum.getStatus(this.startTime, this.endTime, this.isOn);
     }
 
 }

mp-service/src/main/java/com/qs/mp/user/domain/vo/UserMarketingDetailVO.java

@@ -51,23 +51,6 @@ public class UserMarketingDetailVO {
     List<MarketingAwardsVO> awardsList;
 
     public String getStatus() {
-
-        if (MarketingStatusEnum.OFF.getValue().equals(this.isOn)) {
-            return MarketingStatusEnum.OFF.toString();
-        }
-        if (MarketingStatusEnum.CLOSE.getValue().equals(this.isOn)) {
-            return MarketingStatusEnum.CLOSE.toString();
-        }
-
-        Date now = DateUtils.getNowDate();
-        if (now.before(this.startTime)) {
-            return MarketingStatusEnum.UNSTART.toString();
-        }
-
-        if (now.after(this.endTime)) {
-            return MarketingStatusEnum.END.toString();
-        }
-
-        return MarketingStatusEnum.START.toString();
+        return MarketingStatusEnum.getStatus(this.startTime, this.endTime, this.isOn);
     }
 }

mp-service/src/main/java/com/qs/mp/user/domain/vo/UserMarketingListVO.java

@@ -42,24 +42,7 @@ public class UserMarketingListVO {
     private String status;
 
     public String getStatus() {
-
-        if (MarketingStatusEnum.OFF.getValue().equals(this.isOn)) {
-            return MarketingStatusEnum.OFF.toString();
-        }
-        if (MarketingStatusEnum.CLOSE.getValue().equals(this.isOn)) {
-            return MarketingStatusEnum.CLOSE.toString();
-        }
-
-        Date now = DateUtils.getNowDate();
-        if (now.before(this.startTime)) {
-            return MarketingStatusEnum.UNSTART.toString();
-        }
-
-        if (now.after(this.endTime)) {
-            return MarketingStatusEnum.END.toString();
-        }
-
-        return MarketingStatusEnum.START.toString();
+        return MarketingStatusEnum.getStatus(this.startTime,this.endTime,this.isOn);
     }
 
 }