|
|
@@ -236,8 +236,8 @@ export class AiChatService {
|
|
|
return data.data;
|
|
|
}
|
|
|
/* 获取好友列表 */
|
|
|
- async getFriends(uid: string,val?:string): Promise<any> {
|
|
|
- let where = val ? `WHERE u.nickname LIKE '%${val}%'` : ''
|
|
|
+ async getFriends(uid: string, val?: string): Promise<any> {
|
|
|
+ let where = val ? `WHERE u.nickname LIKE '%${val}%'` : '';
|
|
|
let rejectsSql = `SELECT invited FROM "EventLog" WHERE "isDeleted" IS NOT TRUE AND "user" = '${uid}' AND "isAward" = TRUE `;
|
|
|
let data: any = await this.http.customSQL(rejectsSql);
|
|
|
let list = data.data;
|
|
|
@@ -257,7 +257,11 @@ export class AiChatService {
|
|
|
GROUP BY fid,"channel",deadline) AS f
|
|
|
LEFT JOIN "_User" AS u
|
|
|
ON u."objectId" = f.fid
|
|
|
- ${notInclude.length > 0 ? `WHERE u."objectId" NOT IN (${notInclude}) AND u.nickname LIKE '%${val}%'` : where}
|
|
|
+ ${
|
|
|
+ notInclude.length > 0
|
|
|
+ ? `WHERE u."objectId" NOT IN (${notInclude}) AND u.nickname LIKE '%${val}%'`
|
|
|
+ : where
|
|
|
+ }
|
|
|
`;
|
|
|
return this.http.customSQL(sql);
|
|
|
}
|
|
|
@@ -335,13 +339,34 @@ export class AiChatService {
|
|
|
return data?.data;
|
|
|
}
|
|
|
|
|
|
- async getOrderAnchor(type?: string, limit?: number) {
|
|
|
+ async getOrderAnchor(type?: string, limit?: number, range?: string) {
|
|
|
+ let startTime;
|
|
|
+ let date = new Date();
|
|
|
+ switch (range) {
|
|
|
+ case 'day':
|
|
|
+ startTime =
|
|
|
+ date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
|
|
|
+ break;
|
|
|
+ case 'week':
|
|
|
+ date.setDate(date.getDate() - date.getDay() + 1);
|
|
|
+ date = new Date();
|
|
|
+ startTime =
|
|
|
+ date.getFullYear() +
|
|
|
+ '-' +
|
|
|
+ (date.getMonth() + 1) +
|
|
|
+ '-' +
|
|
|
+ date.getDate();
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ break;
|
|
|
+ }
|
|
|
let sql = `SELECT us."objectId",us."nickname",us."avatar",ROUND(SUM("credit")::numeric, 2) AS credit
|
|
|
FROM (
|
|
|
SELECT COALESCE(SUM(llog.gold ),0) AS "credit",llog."toUser" AS uid
|
|
|
FROM "LoveRender" AS llog
|
|
|
WHERE llog.company = '${this.company}'
|
|
|
AND llog."isDeleted" IS NOT TRUE
|
|
|
+ ${range ? `AND llog."createdAt" >= '${startTime}'` : ''}
|
|
|
GROUP BY llog."toUser"
|
|
|
UNION
|
|
|
SELECT SUM(lalog.duration / 60 * lalog.unit) "credit","Room"."user" AS uid
|
|
|
@@ -350,6 +375,7 @@ export class AiChatService {
|
|
|
ON lalog."room" = "Room"."objectId"
|
|
|
WHERE lalog.company = '${this.company}'
|
|
|
AND lalog."isDeleted" IS NOT TRUE
|
|
|
+ ${range ? `AND lalog."createdAt" >= '${startTime}'` : ''}
|
|
|
GROUP BY "Room"."user"
|
|
|
) AS tbl
|
|
|
LEFT JOIN "_User" us
|
|
|
@@ -363,12 +389,14 @@ export class AiChatService {
|
|
|
FROM "LoveRender" AS llog
|
|
|
WHERE llog.company = '${this.company}'
|
|
|
AND llog."isDeleted" IS NOT TRUE
|
|
|
+ ${range ? `AND llog."createdAt" >= '${startTime}'` : ''}
|
|
|
GROUP BY llog."fromUser"
|
|
|
UNION
|
|
|
SELECT SUM(lalog.duration / 60 * lalog.unit) "credit",lalog."user" AS uid
|
|
|
FROM "LiveActiveLog" AS lalog
|
|
|
WHERE lalog.company = '${this.company}'
|
|
|
AND lalog."isDeleted" IS NOT TRUE
|
|
|
+ ${range ? `AND lalog."createdAt" >= '${startTime}'` : ''}
|
|
|
GROUP BY lalog."user"
|
|
|
) AS tbl
|
|
|
LEFT JOIN "_User" us
|
warrior