Merge branch 'bugfix' into release

src/api_cross/wzry/ApiRank.ts

@@ -1,39 +1,32 @@
-import { ApiCall } from "tsrpc";
+import {ApiCall} from "tsrpc";
-import { ReqRank, ResRank } from "../../cross/protocols/wzry/PtlRank";
+import {ReqRank, ResRank} from "../../cross/protocols/wzry/PtlRank";
-import { ChatFun } from "../../public/chat";
+import {player} from "../../shared/protocols/user/type";
-import { EmailFun } from "../../public/email";
+import {FindOptions} from "mongodb";
-import { FightFun } from "../../public/fight";
-import { Rank } from '../../public/rank/rank';
-import { SchedulerWzryDlDstart, wzrygroup } from "../../public/scheduler/scheduler_wzry";
-import { WangZheRongYaofun } from "../../public/wzry";
-import { PublicShared } from "../../shared/public/public";
-import { player } from "../../shared/protocols/user/type";
-import { rankInfo } from "../../shared/protocols/type";
-import { FindOptions } from "mongodb";
 
-export async function getRankList(limit?: number, projection?:any){
+export async function getRankList(limit?: number, projection?: any) {
-    let option : FindOptions = {
+    let option: FindOptions = {
-        sort : {
+        sort: {
-            'data.valArr': -1
+            'data.valArr': -1,
+            'data.player.power': -1
         }
     }
-    if(limit!=null){
+    if (limit != null) {
         option.limit = limit;
     }
-    if(projection!=null){
+    if (projection != null) {
         option.projection = projection;
     }
 
-    let listArr = await G.mongodb.collection('rankList').find({ type: 'wzryCross' },option).toArray();
+    let listArr = await G.mongodb.collection('rankList').find({type: 'wzryCross'}, option).toArray();
     let list = listArr.map(l => l.data);
 
     return list;
 }
 
 export async function getPlayerRank(uid: string) {
-    let _r = await getRankList(50,{
+    let _r = await getRankList(50, {
-        "data.player.uid":1,
+        "data.player.uid": 1,
-        "data.valArr":1,
+        "data.valArr": 1,
     });
     if (!Object.keys(_r).length) {
         return -1
@@ -42,14 +35,14 @@ export async function getPlayerRank(uid: string) {
     return myrank;
 }
 
-export async function getWzryRankList(uid: string, gud: player){
+export async function getWzryRankList(uid: string, gud: player) {
     let list = await getRankList(50);
     return {
         rankList: list,
         myRank: {
             rank: list.findIndex(li => li.player.uid == uid) + 1 || -1,
             player: gud,
-            valArr: [(await G.mongodb.collection('wzry_fight').findOne({ uid: uid }))?.jifen || 0]
+            valArr: [(await G.mongodb.collection('wzry_fight').findOne({uid: uid}))?.jifen || 0]
         }
     };
 }

src/api_s2c/event/shouchong/ApiOpen.ts

@@ -1,11 +1,14 @@
 import { ApiCall } from "tsrpc";
 import { ReqOpen, ResOpen } from "../../../shared/protocols/event/shouchong/PtlOpen";
+import {PayFun} from "../../../public/pay";
 
 export default async function (call: ApiCall<ReqOpen, ResOpen>) {
-    let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
+    let data = await G.mongodb.cEvent('shouchongzhigou').findOne({uid: call.uid, type: 'shouchongzhigou'})
+
+    let payIds = R.compose(R.map(i=>i.payid),R.values())(G.gc.shouchong)
 
     call.succ({
-        payNum: call.conn.gud.payExp / 10,
+        receive: data?.receive || {},
-        receive: Object.fromEntries(Object.keys(G.gc.shouchong).map(k => [k, data?.receive?.[k] || []]))
+        buyLog: await PayFun.getPayLogs(call.uid, payIds)
-    });
+    })
 }

src/api_s2c/event/shouchong/ApiReceive.ts

@@ -1,28 +1,31 @@
-import { ApiCall } from "tsrpc";
+import {ApiCall} from "tsrpc";
-import { PlayerFun } from '../../../public/player';
+import {PlayerFun} from '../../../public/player';
-import { ReqReceive, ResReceive } from "../../../shared/protocols/event/shouchong/PtlReceive";
+import {ReqReceive, ResReceive} from "../../../shared/protocols/event/shouchong/PtlReceive";
-import { PublicShared } from '../../../shared/public/public';
+import {PublicShared} from '../../../shared/public/public';
-import { HongDianChange } from "../../hongdian/fun";
+import {HongDianChange} from "../../hongdian/fun";
+import {PayFun} from "../../../public/pay";
 
 export default async function (call: ApiCall<ReqReceive, ResReceive>) {
 
     let conf = G.gc.shouchong[call.req.k];
-
     if (!conf) return call.error(globalThis.lng.pata_getprize_1);
 
-    let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
+    let payLog = await PayFun.getPayLog(call.uid, conf.payid)
+    if (!payLog) return call.errorCode(-1)
+
+    let data = await G.mongodb.cEvent('shouchongzhigou').findOne({ uid: call.uid, type: 'shouchongzhigou' });
 
     let recArr = data?.receive?.[call.req.k] || [];
 
-    if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9);
+    // if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9);
 
     if (recArr.length >= conf.prize.length) return call.error(globalThis.lng.event_kfkh_3);
 
     if (recArr.slice(-1)[0] && PublicShared.getToDayZeroTime() < recArr.slice(-1)[0]) return call.error(globalThis.lng.event_kfkh_10);
 
     await PlayerFun.sendPrize(call, conf.prize[recArr.length]);
-    await G.mongodb.cEvent('shouchong').updateOne(
+    await G.mongodb.cEvent('shouchongzhigou').updateOne(
-        { uid: call.uid, type: 'shouchong' },
+        { uid: call.uid, type: 'shouchongzhigou' },
         { $push: G.mongodb.createTreeObj({ key: 'receive', k: call.req.k, val: G.time }) },
         { upsert: true }
     );
@@ -40,17 +43,16 @@ export default async function (call: ApiCall<ReqReceive, ResReceive>) {
 }
 
 export async function getShouChongRedPoint(call: ApiCall) {
-    let res = { show: false };
+    // let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
-    let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
+    //
+    // for (let [id, conf] of Object.entries(G.gc.shouchong)) {
+    //     let rec = data?.receive?.[id] || [];
+    //     if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue;
+    //     if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) {
+    //         res = { show: true };
+    //         break;
+    //     }
+    // }
 
-    for (let [id, conf] of Object.entries(G.gc.shouchong)) {
+    return {show: false};
-        let rec = data?.receive?.[id] || [];
-        if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue;
-        if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) {
-            res = { show: true };
-            break;
-        }
-    }
-
-    return res;
 }

src/module/collection_event.ts

@@ -26,6 +26,9 @@ export type eventType = {
     shouchong: {
         receive: k_v<number[]>;
     };
+    shouchongzhigou: {
+        receive: k_v<number[]>;
+    };
     kaifukuanghuan: Omit<ResOpen, 'day' | 'taskFinished'>;
     dayjijin: Omit<ResOpenJiJin, 'isPay' | 'finished'>;
     dengjijijin: Omit<ResOpenJiJin, 'isPay' | 'finished'>;

src/setMongodb.ts

@@ -640,25 +640,25 @@ export class _mongodb {
     }
 }
 
-//@ts-ignore
+// //@ts-ignore
-FindCursor.prototype._toArray = FindCursor.prototype.toArray;
+// FindCursor.prototype._toArray = FindCursor.prototype.toArray;
-//@ts-ignore
+// //@ts-ignore
-FindCursor.prototype.toArray = async function(){
+// FindCursor.prototype.toArray = async function(){
-    let rss = await this._toArray();
+//     let rss = await this._toArray();
-
+//
-    //如果返回的数据超过50条
+//     //如果返回的数据超过50条
-    if(rss.length>50){
+//     if(rss.length>50){
-        addGameLog("system","findCount",null,{
+//         addGameLog("system","findCount",null,{
-            collection: this.namespace.collection,
+//             collection: this.namespace.collection,
-            db:this.namespace.db,
+//             db:this.namespace.db,
-            count:rss.length
+//             count:rss.length
-        })
+//         })
-        console.log("system,findCount",{
+//         console.log("system,findCount",{
-            collection: this.namespace.collection,
+//             collection: this.namespace.collection,
-            db:this.namespace.db,
+//             db:this.namespace.db,
-            count:rss.length
+//             count:rss.length
-        })
+//         })
-        console.trace();
+//         console.trace();
-    }
+//     }
-    return rss;
+//     return rss;
-}
+// }

src/shared/protocols/event/shouchong/PtlOpen.ts

@@ -8,8 +8,10 @@ export type ReqOpen = {
 };
 
 export type ResOpen = {
-    payNum: number;
     receive: {
         [k: string]: number[];
     };
+    buyLog:{
+        [k: string]: any;
+    }
 };

src/shared/protocols/serviceProto.ts

@@ -10262,13 +10262,6 @@ export const serviceProto: ServiceProto<ServiceType> = {
             "properties": [
                 {
                     "id": 0,
-                    "name": "payNum",
-                    "type": {
-                        "type": "Number"
-                    }
-                },
-                {
-                    "id": 1,
                     "name": "receive",
                     "type": {
                         "type": "Interface",
@@ -10282,6 +10275,19 @@ export const serviceProto: ServiceProto<ServiceType> = {
                             }
                         }
                     }
+                },
+                {
+                    "id": 1,
+                    "name": "buyLog",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Any"
+                            }
+                        }
+                    }
                 }
             ]
         },