Browse Source

🎈 perf: 优化次数赠送功能

Pchen0 1 week ago
parent
commit
c3f88a9906

+ 11 - 2
apis/Goods/Admin/ApproveSendCountRequest.js

@@ -52,6 +52,12 @@ class ApproveSendCountRequest extends API {
                 return res.json({ ...BaseStdResponse.ERR, msg: "该申请已审核,请刷新后重试!" })
                 return res.json({ ...BaseStdResponse.ERR, msg: "该申请已审核,请刷新后重试!" })
             }
             }
 
 
+            const [senderRows] = await conn.execute(
+                "SELECT username FROM users WHERE uuid = ?",
+                [request.sender_uuid]
+            )
+            const senderUsername = senderRows && senderRows[0] ? senderRows[0].username : "未知用户"
+
             const [receiverRows] = await conn.execute(
             const [receiverRows] = await conn.execute(
                 "SELECT uuid, lepao_count FROM users WHERE id = ? FOR UPDATE",
                 "SELECT uuid, lepao_count FROM users WHERE id = ? FOR UPDATE",
                 [request.receiver_user_id]
                 [request.receiver_user_id]
@@ -91,7 +97,8 @@ class ApproveSendCountRequest extends API {
                 balanceAfter: beforeCount + Number(request.count || 0),
                 balanceAfter: beforeCount + Number(request.count || 0),
                 bizType: 'gift_receive',
                 bizType: 'gift_receive',
                 bizId: `send_request:${id}`,
                 bizId: `send_request:${id}`,
-                operatorUuid: uuid
+                operatorUuid: uuid,
+                remark: `用户${senderUsername}赠送${request.count}次`
             })
             })
 
 
             await conn.commit()
             await conn.commit()
@@ -133,7 +140,9 @@ class ApproveSendCountRequest extends API {
             this.logger.error(`审核通过赠送申请失败!${err.message || "未知错误"}`)
             this.logger.error(`审核通过赠送申请失败!${err.message || "未知错误"}`)
             return res.json({ ...BaseStdResponse.ERR, msg: "审核通过失败,请稍后再试!" })
             return res.json({ ...BaseStdResponse.ERR, msg: "审核通过失败,请稍后再试!" })
         } finally {
         } finally {
-            conn.release()
+            if (conn?.connection && typeof conn.connection.release === 'function' && typeof conn?.release === 'function') {
+                conn.release()
+            }
         }
         }
     }
     }
 }
 }

+ 3 - 1
apis/Goods/Admin/RejectSendCountRequest.js

@@ -138,7 +138,9 @@ class RejectSendCountRequest extends API {
             this.logger.error(`拒绝赠送申请失败!${err.message || "未知错误"}`)
             this.logger.error(`拒绝赠送申请失败!${err.message || "未知错误"}`)
             return res.json({ ...BaseStdResponse.ERR, msg: "拒绝申请失败,请稍后再试!" })
             return res.json({ ...BaseStdResponse.ERR, msg: "拒绝申请失败,请稍后再试!" })
         } finally {
         } finally {
-            conn.release()
+            if (conn?.connection && typeof conn.connection.release === 'function' && typeof conn?.release === 'function') {
+                conn.release()
+            }
         }
         }
     }
     }
 }
 }

+ 5 - 2
apis/Goods/SendCount.js

@@ -81,7 +81,8 @@ class SendCount extends API {
                 balanceBefore: Number(senderRows[0].lepao_count || 0),
                 balanceBefore: Number(senderRows[0].lepao_count || 0),
                 balanceAfter: Number(senderRows[0].lepao_count || 0) - count,
                 balanceAfter: Number(senderRows[0].lepao_count || 0) - count,
                 bizType: 'gift_send_lock',
                 bizType: 'gift_send_lock',
-                bizId: `send_request:${requestId}`
+                bizId: `send_request:${requestId}`,
+                remark: `向用户${username}赠送${count}次`
             })
             })
             await conn.commit()
             await conn.commit()
             const createTime = new Date().getTime()
             const createTime = new Date().getTime()
@@ -127,7 +128,9 @@ class SendCount extends API {
                 msg: `赠送次数失败,请稍后再试!`
                 msg: `赠送次数失败,请稍后再试!`
             })
             })
         } finally {
         } finally {
-            conn.release()
+            if (conn?.connection && typeof conn.connection.release === 'function' && typeof conn?.release === 'function') {
+                conn.release()
+            }
         }
         }
     }
     }
 }
 }

+ 4 - 2
apis/Lepao/Account/Admin/ChangeLepaoCount.js

@@ -77,7 +77,7 @@ class ChangeLepaoCount extends API {
                     bizType: 'admin_adjust',
                     bizType: 'admin_adjust',
                     bizId: `admin_adjust:${Date.now()}:${userid}`,
                     bizId: `admin_adjust:${Date.now()}:${userid}`,
                     operatorUuid: uuid,
                     operatorUuid: uuid,
-                    remark: '管理员手工调整次数'
+                    remark: '系统调整次数'
                 })
                 })
             }
             }
 
 
@@ -89,7 +89,9 @@ class ChangeLepaoCount extends API {
                 ...BaseStdResponse.DATABASE_ERR
                 ...BaseStdResponse.DATABASE_ERR
             })
             })
         } finally {
         } finally {
-            conn.release()
+            if (conn?.connection && typeof conn.connection.release === 'function' && typeof conn?.release === 'function') {
+                conn.release()
+            }
         }
         }
 
 
         res.json({
         res.json({

+ 2 - 0
apis/Lepao/Count/Ledger/AdminList.js

@@ -86,6 +86,7 @@ class AdminList extends API {
                 l.id,
                 l.id,
                 l.user_uuid,
                 l.user_uuid,
                 u.username,
                 u.username,
+                u.avatar AS user_avatar,
                 la.student_num,
                 la.student_num,
                 l.delta,
                 l.delta,
                 l.balance_before,
                 l.balance_before,
@@ -94,6 +95,7 @@ class AdminList extends API {
                 l.biz_id,
                 l.biz_id,
                 l.operator_uuid,
                 l.operator_uuid,
                 op.username AS operator_name,
                 op.username AS operator_name,
+                op.avatar AS operator_avatar,
                 l.remark,
                 l.remark,
                 UNIX_TIMESTAMP(l.created_at) * 1000 AS created_at
                 UNIX_TIMESTAMP(l.created_at) * 1000 AS created_at
             FROM lepao_count_ledger l
             FROM lepao_count_ledger l