allnet: fix playhistory

core/data/schema/arcade.py

@@ -426,13 +426,20 @@ class ArcadeData(BaseData):
             product_code=product_code,
             product_count=product_count,
             func_type=func_type,
-            player_num=player_num
+            player_number=player_num
         ))
 
         if result is None:
             self.logger.error(f"Failed to add billing charge for machine {machine_id}!")
             return None
         return result.lastrowid
+    
+    async def billing_get_last_charge(self, machine_id: int, game_id: str) -> Optional[Row]:
+        result = await self.execute(billing_charge.select(
+            and_(billing_charge.c.machine == machine_id, billing_charge.c.game_id == game_id)
+        ).order_by(billing_charge.c.id.desc()).limit(3))
+        if result:
+            return result.fetchone()
 
     async def billing_set_credit(self, machine_id: int, game_id: str, chute_type: int, service_type: int, op_mode: int, coin_rate0: int, coin_rate1: int,
         bonus_adder: int, coin_to_credit_rate: int, coin_count_slot0: int, coin_count_slot1: int, coin_count_slot2: int, coin_count_slot3: int,
@@ -483,7 +490,9 @@ class ArcadeData(BaseData):
         return result.lastrowid
 
     async def billing_get_credit(self, machine_id: int, game_id: str) -> Optional[Row]:
-        result = await self.execute(billing_credit.select(billing_credit.c.machine == machine_id))
+        result = await self.execute(billing_credit.select(
+            and_(billing_credit.c.machine == machine_id, billing_credit.c.game_id == game_id)
+        ))
         if result:
             return result.fetchone()
 
@@ -512,6 +521,15 @@ class ArcadeData(BaseData):
         if result is not None:
             return result.fetchall()
 
+    async def billing_get_last_playcount(self, machine_id: int, game_id: str) -> Optional[Row]:
+        result = await self.execute(billing_playct.select(and_(
+            billing_playct.c.machine == machine_id,
+            billing_playct.c.game_id == game_id
+        )).order_by(billing_playct.c.year.desc(), billing_playct.c.month.desc()).limit(1))
+
+        if result is not None:
+            return result.fetchone()
+
     def format_serial(
         self, platform_code: str, platform_rev: int, serial_letter: str, serial_num: int, append: int, dash: bool = False
     ) -> str: