feat: merge func

src/main/kotlin/cn/rtast/fancybot/util/file/NiuziManager.kt

@@ -12,6 +12,7 @@ import cn.rtast.fancybot.entity.db.NiuziTable
 import cn.rtast.fancybot.entity.db.NiuziTable.length
 import cn.rtast.fancybot.entity.db.NiuziTable.timestamp
 import cn.rtast.fancybot.entity.db.NiuziTable.userId
+import cn.rtast.fancybot.entity.db.SignTable
 import cn.rtast.fancybot.util.isSameDay
 import cn.rtast.fancybot.util.suspendedTransaction
 import org.jetbrains.exposed.sql.insert
@@ -95,4 +96,14 @@ class NiuziManager {
         }
         return success to randomLength
     }
+
+    suspend fun redeemItem(id: Long, itemPrice: Double): Niuzi? {
+        val current = getUser(id)
+        suspendedTransaction {
+            NiuziTable.update({ userId eq id }) {
+                it[length] = current?.length!! - itemPrice
+            }
+        }
+        return getUser(id)
+    }
 }

src/main/kotlin/cn/rtast/fancybot/util/file/SignManager.kt

@@ -1,76 +0,0 @@
-/*
- * Copyright © 2024 RTAkland
- * Author: RTAkland
- * Date: 2024/8/30
- */
-
-
-package cn.rtast.fancybot.util.file
-
-import cn.rtast.fancybot.entity.db.JrrpRecord
-import cn.rtast.fancybot.entity.db.SignTable
-import cn.rtast.fancybot.entity.db.SignTable.point
-import cn.rtast.fancybot.entity.db.SignTable.timestamp
-import cn.rtast.fancybot.entity.db.SignTable.userId
-import cn.rtast.fancybot.util.isSameDay
-import cn.rtast.fancybot.util.suspendedTransaction
-import org.jetbrains.exposed.sql.insert
-import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.sql.update
-import java.time.Instant
-import kotlin.random.Random
-
-class SignManager {
-
-    private suspend fun getRecord(id: Long): JrrpRecord? {
-        return suspendedTransaction {
-            SignTable.selectAll().where { userId eq id }.map {
-                JrrpRecord(
-                    it[userId],
-                    it[timestamp],
-                    it[point],
-                )
-            }.singleOrNull()
-        }
-    }
-
-    suspend fun isSigned(id: Long): Boolean {
-        val record = getRecord(id)
-        return record?.timestamp?.isSameDay(Instant.now().epochSecond) ?: false
-    }
-
-    suspend fun sign(id: Long): Long {
-        val randomPoint = Random.nextLong(0, 101)
-        if (getRecord(id) == null) {
-            suspendedTransaction {
-                SignTable.insert {
-                    it[userId] = id
-                    it[timestamp] = Instant.now().epochSecond
-                    it[point] = 0
-                }
-            }
-        }
-        val record = getRecord(id)
-        suspendedTransaction {
-            SignTable.update({ userId eq id }) {
-                it[point] = record?.points!! + randomPoint
-                it[timestamp] = Instant.now().epochSecond
-            }
-        }
-        return randomPoint
-    }
-
-    suspend fun getStatus(id: Long): JrrpRecord? {
-        return getRecord(id)
-    }
-
-    suspend fun redeemItem(id: Long, itemPrice: Int): JrrpRecord? {
-        val current = getRecord(id)
-        suspendedTransaction {
-            SignTable.update({ userId eq id }) {
-                it[point] = current?.points!! - itemPrice
-            }
-        }
-        return getRecord(id)
-    }
-}

src/main/kotlin/cn/rtast/fancybot/util/item/Item.kt

@@ -8,22 +8,15 @@
 package cn.rtast.fancybot.util.item
 
 import cn.rtast.rob.entity.GroupMessage
-import cn.rtast.rob.entity.PrivateMessage
 import cn.rtast.rob.util.ob.OneBotListener
 
 abstract class Item {
     abstract val itemNames: List<String>
-    abstract val itemPrice: Int
+    abstract val itemPrice: Double
 
-    protected open suspend fun redeemInGroup(listener: OneBotListener, message: GroupMessage, after: Long) {}
+    protected open suspend fun redeemInGroup(listener: OneBotListener, message: GroupMessage, after: Double) {}
 
-    protected open suspend fun redeemInPrivate(listener: OneBotListener, message: PrivateMessage, after: Long) {}
-
-    suspend fun redeemGroup(listener: OneBotListener, message: GroupMessage, after: Long) {
+    suspend fun redeemGroup(listener: OneBotListener, message: GroupMessage, after: Double) {
         this.redeemInGroup(listener, message, after)
     }
-
-    suspend fun redeemPrivate(listener: OneBotListener, message: PrivateMessage, after: Long) {
-        this.redeemInPrivate(listener, message, after)
-    }
 }