修改实时计算保存的实体为对象

performance-web/src/main/java/com/clx/performance/dto/OrderChildExpectDTO.java

@@ -6,7 +6,6 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 @Getter
 @Setter
@@ -17,9 +16,9 @@ public class OrderChildExpectDTO implements Serializable {
 
 
     private String childNo;//子订单编号
-    private LocalDateTime expectArriveTime;//预计到达货源地时间
+    private String expectArriveTime;//预计到达货源地时间
     private Integer expectArriveTimeSecond;//预计到达货源地时间
-    private LocalDateTime expectReceiveTime;//预计到达目的地时间
+    private String expectReceiveTime;//预计到达目的地时间
     private Integer expectReceiveTimeSecond;//预计到达目的地时间
     private Integer expectTransportTimeSecond;//预计运输时间
     private String expectTransportTime;//预计运输时间(转化秒 为几小时几分钟)

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

 package com.clx.performance.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.enums.OrderEnum;
@@ -42,6 +41,7 @@ import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.amqp.core.AmqpTemplate;
@@ -1562,8 +1562,8 @@ public class OrderChildServiceImpl implements OrderChildService {
                     }
                 }
 
-                if(Objects.nonNull(oneExpect.getExpectArriveTime())){
-                    LocalDateTime expectArriveTime = oneExpect.getExpectArriveTime();
+                if(StringUtils.isNotBlank(oneExpect.getExpectArriveTime())){
+                    LocalDateTime expectArriveTime = DateUtils.parseDateTime(oneExpect.getExpectArriveTime()).get();
                     monitorOrderChild.setExpectArriveTimeRealTime(DateUtils.formatDateTime(expectArriveTime).get());
                     LocalDateTime expectArriveWarringTime = expectArriveTime.plusMinutes(arriveWarningTime);
                     if(expectArriveWarringTime.isBefore(now) && child.getStatus() < OrderChildEnum.Status.ARRIVE_SEND.getCode()){
@@ -1573,8 +1573,8 @@ public class OrderChildServiceImpl implements OrderChildService {
                     }
 
                 }
-                if(Objects.nonNull(oneExpect.getExpectReceiveTime())){
-                    LocalDateTime expectReceiveTime = oneExpect.getExpectReceiveTime();
+                if(StringUtils.isNotBlank(oneExpect.getExpectReceiveTime())){
+                    LocalDateTime expectReceiveTime = DateUtils.parseDateTime(oneExpect.getExpectReceiveTime()).get();
                     monitorOrderChild.setExpectReceiveTimeRealTime(DateUtils.formatDateTime(expectReceiveTime).get());
                     LocalDateTime expectReceiveWarringTime = expectReceiveTime.plusMinutes(receiveWarningTime);
                     if(expectReceiveWarringTime.isBefore(now)
@@ -1674,10 +1674,10 @@ public class OrderChildServiceImpl implements OrderChildService {
                 LocalDateTime expectTime = now.plusSeconds(plusTime);
 
                 if (childStatus < OrderChildEnum.Status.ARRIVE_SEND.getCode()) {
-                    expect.setExpectArriveTime(expectTime);
+                    expect.setExpectArriveTime(DateUtils.formatDateTime(expectTime).get());
                     expect.setExpectArriveTimeSecond(plusTime);
                 } else {
-                    expect.setExpectReceiveTime(expectTime);
+                    expect.setExpectReceiveTime(DateUtils.formatDateTime(expectTime).get());
                     expect.setExpectReceiveTimeSecond(plusTime);
                 }
                 cacheOrderChildExpectData(childNo,expect);