diff --git a/assest/fsm.png b/assest/fsm.png index 11e479e..8b4fa7c 100644 Binary files a/assest/fsm.png and b/assest/fsm.png differ diff --git a/util/Task/__init__.py b/util/Task/__init__.py index 3cacc40..c8f1044 100644 --- a/util/Task/__init__.py +++ b/util/Task/__init__.py @@ -107,19 +107,10 @@ def __init__( ) # 等待开票结束 - self.machine.add_transition( - trigger="WaitAvailable", - source="等待开票", - dest="创建订单", - # 倒计时30s时已获取Token - conditions=lambda: self.skipToken, - ) self.machine.add_transition( trigger="WaitAvailable", source="等待开票", dest="获取Token", - # 无倒计时, 开始获取Token - conditions=lambda: not self.skipToken, ) # 获取Token结束 @@ -161,6 +152,7 @@ def __init__( conditions=lambda: self.riskProcessCode != 0, ) + # 等待余票结束 self.machine.add_transition( trigger="QueryTicket", source="等待余票", @@ -280,13 +272,6 @@ def WaitAvailableAction(self) -> None: sleep(5) countdown -= 5 - elif countdown == 30: - logger.info("【等待开票】即将开票! 正在提前获取Token...") - self.QueryTokenAction() - self.skipToken = True - if self.queryTokenCode == -401: - self.RiskProcessAction() - elif 60 > countdown > 1: logger.info(f"【等待开票】即将开票! 需要等待 {countdown-1} 秒") sleep(1)