dd

ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyModeAutoServiceImpl.java

@@ -366,8 +366,7 @@ public class SubsidyModeAutoServiceImpl implements ISubsidyModeAutoService {
 
         if(targetMode.getSharedMode() && !targetMode.getImmediateArrival())
         {
-            SubsidySharedPool subsidySharedPool = subsidySharedPoolService.initSharedPool(targetMode, BigDecimal.ZERO);
-            return subsidySharedPool;
+            return  subsidySharedPoolService.initSharedPool(targetMode, BigDecimal.ZERO);
         }
 
         return null;

ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidySharedPoolServiceImpl.java

@@ -322,6 +322,7 @@ public class SubsidySharedPoolServiceImpl implements ISubsidySharedPoolService {
             SubsidyMode currentMode = subsidyModeService.loadCurrentMode(subsidySharedPool.getBusinessId());
             if (currentMode.getDefaulted() && currentMode.getSharedMode() && !currentMode.getImmediateArrival()) {
                 //开启均摊池
+                log.info("开启下一期的商户均摊池");
                 return initSharedPool(currentMode, BigDecimal.ZERO);
             }
         }

ruoyi-rabbitmq/src/main/java/com/ruoyi/rabbitmq/client/RabbitMqClient.java

@@ -388,11 +388,11 @@ public class RabbitMqClient {
      */
     public void send(String exchange, String routingKey, String jsonStr, int delaySec) {
         String msgId = IdUtil.simpleUUID();
-        if(!"prod".equals(active))
-        {
-            delaySec = 300*1000;
-//            delaySec = 1800*1000;
-        }
+//        if(!"prod".equals(active))
+//        {
+//            delaySec = 300*1000;
+////            delaySec = 1800*1000;
+//        }
         //请求头设置消息id（messageId）
         Message message = MessageBuilder.withBody(jsonStr.getBytes()).setContentType(MessageProperties.CONTENT_TYPE_JSON)
             .setContentEncoding("utf-8").setMessageId(msgId).build();