Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/receiver/AbstractRedisReceiver.java

@@ -41,12 +41,19 @@ public abstract class AbstractRedisReceiver implements StreamListener<String, Ma
             log.info("consumer success delete message messageId:{} ",message.getId());
             try {
 //                stringRedisTemplate.multi();
-                stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
                 stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
+                stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
 //                stringRedisTemplate.exec();
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("delete redis queue message error messageId:{} errMsg:{}",message.getId(),e.getMessage());
+            }finally {
+                try {
+                    stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
+                    stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
+                } catch (Exception e) {
+                    log.error("error: {}",e);
+                }
             }
 //        }
     }

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/receiver/RedisRefundReceiver.java

@@ -35,12 +35,15 @@ public class RedisRefundReceiver implements StreamListener<String, MapRecord<Str
             log.error("consumer success delete message messageId:{} ",message.getId());
             try {
 //                stringRedisTemplate.multi();
-                stringRedisTemplate.opsForStream().delete(DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode(), message.getId());
                 stringRedisTemplate.opsForStream().acknowledge(DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_GROUP.getCode(), message);
+                stringRedisTemplate.opsForStream().delete(DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode(), message.getId());
 //                stringRedisTemplate.exec();
             } catch (Exception e) {
                 log.error("delete redis queue message Exception error: {} ",e);
                 log.error("delete redis queue message error messageId:{} errMsg:{}",message.getId(),e.getMessage());
+            }finally {
+                stringRedisTemplate.opsForStream().acknowledge(DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_GROUP.getCode(), message);
+                stringRedisTemplate.opsForStream().delete(DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode(), message.getId());
             }
 //        }
     }