Merge branch 'dev' into 'test'

mall-server-admin/src/main/java/com/fzm/mall/server/admin/mq/consumer/order_center/WithdrawConsumer.java

@@ -146,8 +146,11 @@ public class WithdrawConsumer {
             String hash = getHash(tranDto);
             tranDto.setHash(hash);
         }
+        /**
+         * 重试时间加长为20s
+         */
         msgProducer.sendTTL(JSON.toJSONString(tranDto), QueueTTLTypeEnum.ORDER_REFUND_COINS_TTL,
-                5 * 1000);
+                20 * 1000);
     }
 
     private String getHash(TranDto tranDto) {

mall-server-front/src/main/java/com/fzm/mall/server/front/mq/consumer/UserAssetTransferConsumer.java

@@ -170,8 +170,11 @@ public class UserAssetTransferConsumer {
             String hash = getHash(tranDto);
             tranDto.setHash(hash);
         }
+        /**
+         * 重试时间加长为20s
+         */
         msgProducer.sendTTL(JSON.toJSONString(tranDto), QueueTTLTypeEnum.MALL_USER_ASSET_TRANSFER_TTL,
-                5 * 1000);
+                20 * 1000);
     }
 
     private String getHash(TranDto tranDto) {