~opt:queue.order.close;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/AbstractOrderCloseReceiver.java

@@ -32,7 +32,7 @@ import java.util.Map;
 import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
 
 @Slf4j
-public abstract class AbstractOrderCloseReceiver implements StreamListener<String, MapRecord<String, String, Object>> {
+public abstract class AbstractOrderCloseReceiver implements StreamListener<String, MapRecord<String, String, String>> {
     @Autowired
     StringRedisTemplate stringRedisTemplate;
     @Autowired
@@ -43,7 +43,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
     private MongoConverter mongoConverter;
 
     @Override
-    public void onMessage(MapRecord<String, String, Object> message) {
+    public void onMessage(MapRecord<String, String, String> message) {
         log.debug("CONSUMER ORDER_CLOSE [streamKey:{},messageId:{},stream:{},body:{}]",
                 this.getRedisStreamKey(), message.getId(), message.getStream(), message.getValue());
         boolean result = this.consumerOrderCloseHandler(message.getValue());
@@ -63,13 +63,12 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
         }
     }
 
-    private boolean consumerOrderCloseHandler(Map<String, Object> messageMap) {
+    private boolean consumerOrderCloseHandler(Map<String, String> messageMap) {
         try {
-            String orderCode = (String) messageMap.get("id"), type = (String) messageMap.get("type");
-            LocalDateTime time = (LocalDateTime) messageMap.get("time");
+            String orderCode = messageMap.get("id"), type = messageMap.get("type"), time = messageMap.get("time");
 
             LocalDateTime now = LocalDateTime.now();
-            LocalDateTime createdAt = null == time ? now.minusMinutes(5) : time;
+            LocalDateTime createdAt = StringUtils.isEmpty(time) ? now.minusMinutes(5) : LocalDateTime.parse(time);
 
             long durationToMillis = Duration.between(createdAt.plusMinutes(5), now).toMillis();
 
@@ -83,7 +82,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
                 return consumerOrderCloseHandler(messageMap);
             }
         } catch (Exception e) {
-            log.error("CONSUMER ORDER_CLOSE FAIL ==> {}", e.getMessage(), e);
+            log.error("CONSUMER ORDER_CLOSE FAIL ==> {}", messageMap, e);
             stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(messageMap).withStreamKey(this.getRedisStreamKey()));
             return false;
         }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/QueueUtils.java

@@ -86,10 +86,10 @@ public class QueueUtils {
                 streamKey = MQConst.GoblinQueue.GOBLIN_UN_PAY_0.getKey();
                 break;
         }
-        HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
+        HashMap<String, String> map = ObjectUtil.cloneHashMapStringAndString();
         map.put("id", masterOrderCode);
         map.put("type", "GOBLIN");
-        map.put("time", createTime);
+        map.put("time", createTime.toString());
         stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
     }