diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java index bd70c794c..b5ac96318 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java @@ -56,7 +56,7 @@ public class EntryManagerController { * 进件状态是INIT 待处理 AUDIT 审核中 SIGN 待签约 * 3分钟内只能查一次 */ - @GetMapping + @GetMapping("queryEntry") @Debounce(value = "#shopId", interval = 1000 * 60 * 3) public CzgResult queryEntry(Long shopId) { entryManagerTask.entryManager(shopId); diff --git a/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java b/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java index c098099e7..9cbaf0972 100644 --- a/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java +++ b/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java @@ -6,13 +6,12 @@ import com.czg.config.RabbitConstants; import com.czg.config.RedisCst; import com.czg.order.entity.MqLog; import com.czg.order.service.MqLogService; +import com.czg.service.RedisService; import com.czg.service.order.print.PrinterHandler; -import com.czg.service.order.utils.FunUtil; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.context.annotation.Lazy; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import java.util.function.Consumer; @@ -28,7 +27,7 @@ public class PrintMqListener { @Resource private MqLogService mqLogService; @Resource - private FunUtil funUtil; + private RedisService redisService; @Lazy @Resource private PrinterHandler printerHandler; @@ -59,7 +58,7 @@ public class PrintMqListener { throw new RuntimeException("订单打印失败,未传递orderId"); } Boolean printOrder = jsonObject.getBoolean("printOrder"); - funUtil.runFunAndCheckKey(() -> { + redisService.runFunAndCheckKey(() -> { printerHandler.handler(orderId, printOrder != null && !printOrder ? PrinterHandler.PrintTypeEnum.ONE : PrinterHandler.PrintTypeEnum.ONE_AND_ORDER); return null; }, RedisCst.getLockKey("orderPrint", orderId));