u

code/allapp/allapp-go/db/queries/money_record.sql

@@ -1,25 +1,26 @@
--- name: FindUserMoneyRecords :many
-SELECT mr.*
-FROM money_record mr
-WHERE mr.user_id = $1
-  AND mr.record_time BETWEEN $2 AND $3
-ORDER BY mr.record_time DESC, mr.create_time DESC;
-
--- name: FindMoneyRecordsBySpace :many
+-- name: ListMoneyRecords :many
 SELECT
     mr.*,
     u.username AS username
 FROM money_record mr
-         INNER JOIN space_user su
-                    ON mr.user_id = su.user_id
-                        AND su.space_id = $1
-         LEFT JOIN user_info u
-                   ON mr.user_id = u.id
-WHERE mr.record_time BETWEEN $2 AND $3
-ORDER BY mr.record_time DESC, mr.create_time DESC;
+         LEFT JOIN space_user su
+                   ON su.user_id = mr.user_id
+         LEFT JOIN "user" u
+                   ON u.id = mr.user_id
+WHERE
+    mr.record_time BETWEEN $2 AND $3
+  AND (
+    -- 空间账本：属于当前空间的用户
+    su.user_id IS NOT NULL
+        -- 个人账本：当前用户
+        OR mr.user_id = $1
+    )
+ORDER BY
+    mr.record_time DESC,
+    mr.create_time DESC;
 
 
--- name: InsertMoneyRecord :one
+-- name: InsertMoneyRecord :exec
 INSERT INTO money_record (
     id,
     category_id,
@@ -31,8 +32,7 @@ INSERT INTO money_record (
     update_time
 ) VALUES (
              $1, $2, $3, $4, $5,$6,NOW(),NOW()
-         )
-RETURNING *;
+         );
 
 -- name: GetMoneyRecordById :one
 SELECT * FROM money_record WHERE id = $1;
@@ -49,4 +49,7 @@ WHERE id = $1
 RETURNING *;
 
 -- name: DeleteMoneyRecord :exec
-DELETE FROM money_record WHERE id = $1;
+DELETE FROM money_record WHERE id = $1;
+
+-- name: DeleteMoneyRecordByCategoryId :exec
+DELETE FROM money_record WHERE user_id = $1 AND category_id = $2;

code/allapp/allapp-go/db/queries/user_info.sql

@@ -1,30 +0,0 @@
--- 根据 ID 查询单条用户记录
--- name: GetUserById :one
-SELECT *
-FROM user_info
-WHERE id = $1;
-
--- 根据账号查询单条用户记录
--- name: GetUserByAccount :one
-SELECT *
-FROM user_info
-WHERE account = $1;
-
--- 根据账号和密码查询单条用户记录（登录用）
--- name: GetUserForLogin :one
-SELECT *
-FROM user_info
-WHERE account = $1
-  AND password = $2;
-
--- 更新用户最后登录时间，并返回更新后的记录
--- name: UpdateUserLoginLastTime :exec
-UPDATE user_info
-SET last_login_time = now()
-WHERE id = $1;
-
--- 更新用户活跃时间
--- name: UpdateUserActiveTime :exec
-UPDATE user_info
-SET active_time = now()
-WHERE id = $1;