客服活动日期赋值逻辑调整

src/main/java/com/yaoyaozw/customer/entity/CommonReferralBody.java

@@ -104,21 +104,21 @@ public class CommonReferralBody implements Serializable {
     private String h5Content;
 
     public Date getStartTime() {
-        if (ObjectUtil.isNull(this.startTime) && CollectionUtil.isNotEmpty(this.dateList)) {
+        if (CollectionUtil.isNotEmpty(this.dateList)) {
             return dateList.get(0);
         }
         return startTime;
     }
 
     public Date getEndTime() {
-        if (ObjectUtil.isNull(this.endTime) && CollectionUtil.isNotEmpty(this.dateList)) {
+        if (CollectionUtil.isNotEmpty(this.dateList) && this.dateList.size() > 1) {
             return dateList.get(1);
         }
         return endTime;
     }
 
     public List<Date> getDateList() {
-        if (CollectionUtil.isEmpty(this.dateList) && ObjectUtil.isNotNull(this.startTime) && ObjectUtil.isNotNull(this.endTime)) {
+        if (ObjectUtil.isNotNull(this.startTime) && ObjectUtil.isNotNull(this.endTime)) {
             return Arrays.asList(this.startTime, this.endTime);
         }
         return dateList;