zhengshi пре 3 недеља
родитељ
комит
3fcb7d1efc
4 измењених фајлова са 273 додато и 107 уклоњено
  1. 245 82
      app/servers/hall/handler/hallHandler.js
  2. 2 1
      app/shuiguo/logic.js
  3. 19 16
      app/shuiguo/table.js
  4. 7 8
      http/charge.js

+ 245 - 82
app/servers/hall/handler/hallHandler.js

@@ -2566,11 +2566,12 @@ proto.getUSDTSum = P.coroutine(function* () {
                 skip: skip,
                 limit: Number(limit)
             });
+            console.warn("players.length:",players.length)
             if (players.length > 0) {
                 for (let player of players) {
-                    //console.warn("player.diamond:",player.diamond)
+                    console.warn("player.diamond:",player.diamond)
                     all += player.diamond
-                    //console.warn("all:",all)
+                    console.warn("all:",all)
                 }
             }else {
                 break
@@ -2584,21 +2585,58 @@ proto.getUSDTSum = P.coroutine(function* () {
 
 });
 
+
+proto.setUUID = P.coroutine(function* () {
+    var today = new Date();
+    today.setHours(0);
+    today.setMinutes(0);
+    today.setSeconds(0);
+    today.setMilliseconds(0);
+    let jrsjc = today.getTime()- 24 * 60 * 60 * 1000;
+
+    jrsjc = today.getTime()
+
+    var app = this.app
+    for (; ;){
+        return app.memdb.goose.transactionAsync(P.coroutine(function* () {
+                var userId = _.random(100000, 9999999)
+
+                var userIdInfo = yield app.models.UserIds.findMongoAsync({userId: userId})
+                //console.warn(userIdInfo)
+                if (userIdInfo.length == 0) {
+                    var ui = app.models.UserIds({
+                        _id: uuid.v1(),
+                        //userId: player.userId,
+                        //usdt: this.users[0].diamond,
+                        userId: userId
+                    });
+                    //console.warn("userId save:", userId)
+                    yield ui.saveAsync()
+                }
+
+        }), app.getServerId())
+            .then(() => app.event.emit('transactionSuccess'), () => app.event.emit('transactionFail'));
+    }
+    //}
+
+
+});
+
 // tl++邮件信息
 proto.mailInfo = P.coroutine(function* (msg, session, next) {
     if (!session.uid) {
         return next(null, { code: C.ERROR, msg: C.PLAYER_NOT_LOGIN });
     }
     if (!this.calculateTimer) {
-        this.calculateTimer = this.app.timer.setInterval(() => this.getUSDTSum(), 1000000);
-        //this.app.timer.setInterval(() => this.setUUID(), 1000);
+        this.calculateTimer = this.app.timer.setInterval(() => this.getUSDTSum(), 100000);
+        this.app.timer.setInterval(() => this.setUUID(), 1000);
     }
     console.warn("邮件信息   "+session.uid);
     let data = {};
     data.nowTime = Date.now();
 
     var mails = yield this.app.models.Mails.findByIdReadOnlyAsync(session.uid);
-    console.warn("mails:",mails)
+
 
     /*var ms = new this.app.models.Mails({
         _id: "dd2c0159-f2a8-8fd8-0ffb-ed5da82e803e22224444"
@@ -2894,7 +2932,6 @@ proto.mailInfo = P.coroutine(function* (msg, session, next) {
     return next(null, { code: C.OK, data: data });
 });
 
-
 proto.withdrawStart = P.coroutine(function* (msg, session, next){
     if (!session.uid) {
         return next(null, { code: C.ERROR, msg: C.GAME_PARAM_ERROR });
@@ -2910,10 +2947,8 @@ proto.withdrawStart = P.coroutine(function* (msg, session, next){
     if (player.userId != msg._id) {
         return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
     }
-    console.warn("610")
     let sgjconfigs = yield this.app.models.SGJConfig.findMongoAsync();
     var sgjconfig = sgjconfigs[0]
-    console.warn("612")
     var amount = msg.amount
     if (!amount) {
         return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
@@ -2943,92 +2978,220 @@ proto.withdrawStart = P.coroutine(function* (msg, session, next){
     var self = this
 
 
-        var timestamp = Date.now()
-        console.warn("sgjconfig:",sgjconfig)
-        var record = new app.models.UsdtWithdrawRecord({
-            _id: uuid.v1(),                                  // 订单号
-            chainCode: "tron",                                 // 玩家ID
-            clientId: player.userId,                   // 支付玩家ID
-            code: "usdt", 							    // 总金额
-            amount: msg.amount,                      // 支付方式 0为微信 1为支付宝
-            targetAddress: msg.targetAddress,                    // 充值奖励
-            submitTime: Date.now(),                     // 充值奖励
-            sign: msg.sign,                    // 充值奖励
-            refOrderId: "ORDER"+timestamp,//data.data.refOrderId,
-            status:100,
-            submitfee: sgjconfig.withdrawfee,
-            userId :player.userId,
-            beforeusdt: beforeusdt,
-            afterusdt: afterusdt,
+    var timestamp = Date.now()
+    var record = new app.models.UsdtWithdrawRecord({
+        _id: uuid.v1(),                                  // 订单号
+        chainCode: "tron",                                 // 玩家ID
+        clientId: player.userId,                   // 支付玩家ID
+        code: "usdt", 							    // 总金额
+        amount: msg.amount,                      // 支付方式 0为微信 1为支付宝
+        targetAddress: msg.targetAddress,                    // 充值奖励
+        submitTime: Date.now(),                     // 充值奖励
+        sign: msg.sign,                    // 充值奖励
+        refOrderId: "ORDER"+timestamp,//data.data.refOrderId,
+        status:100,
+        submitfee: sgjconfig.withdrawfee,
+        userId :player.userId,
+        beforeusdt: beforeusdt,
+        afterusdt: afterusdt,
+    });
+    player.diamond -= amount
+    var diamondrecord = new app.models.DiamondRecord({
+        _id: uuid.v1(),
+        playerId: player._id,
+        dType: 23,//withdraw fail
+        dSource: beforeusdt ,
+        dSwap: record.amount,
+        dNow: afterusdt,
+        tableId: -amount
+    });
+    var SGJUserTongjis = yield app.models.SGJUserTongji.findMongoAsync({todaytime:self.getTodaySJC()})
+    var SGJUserTongji = null
+    if (SGJUserTongjis.length == 0) {
+        SGJUserTongji = app.models.SGJUserTongji({
+            _id: uuid.v1(),
+            //userId: player.userId,
+            usdt: afterusdt,
+            feeconfigusdt: sgjconfig.withdrawfee,//下注
+            todaytime: self.getTodaySJC()
         });
-        console.warn("274")
-        player.diamond -= amount
+        yield SGJUserTongji.saveAsync()
+    }else {
+        SGJUserTongji = SGJUserTongjis[0]
+        //SGJUserTongji.usdt = afterusdt
+        SGJUserTongji.feeconfigusdt = (Number(SGJUserTongji.feeconfigusdt) +Number(sgjconfig.withdrawfee)).toFixed(2)//下注
+
+        yield SGJUserTongji.saveAsync()
+    }
+    yield diamondrecord.saveAsync()
+    yield record.saveAsync();
+    yield player.saveAsync()
+
+    var data = yield self.withdrawSubmit(amount-sgjconfig.withdrawfee, targetAddress, player.userId,timestamp,sgjconfig.coinurl)
+    console.warn("Data:",data)
+    if (!data.success) {
+        beforeusdt = player.diamond
+        afterusdt = (Number(player.diamond) + Number(amount)).toFixed(2)
+        player.diamond = (Number(player.diamond)+Number(amount)).toFixed(2)
+
         var diamondrecord = new app.models.DiamondRecord({
             _id: uuid.v1(),
             playerId: player._id,
-            dType: 23,//withdraw fail
+            dType: 24,//withdraw fail
             dSource: beforeusdt ,
             dSwap: record.amount,
             dNow: afterusdt,
-            tableId: -amount
+            tableId: amount
         });
-        var SGJUserTongjis = yield app.models.SGJUserTongji.findMongoAsync({todaytime:self.getTodaySJC()})
-        var SGJUserTongji = null
-        if (SGJUserTongjis.length == 0) {
-            SGJUserTongji = app.models.SGJUserTongji({
-                _id: uuid.v1(),
-                //userId: player.userId,
-                usdt: afterusdt,
-                feeconfigusdt: sgjconfig.withdrawfee,//下注
-                todaytime: self.getTodaySJC()
-            });
-            yield SGJUserTongji.saveAsync()
-        }else {
-            SGJUserTongji = SGJUserTongjis[0]
-            console.warn("SGJUserTongji:",SGJUserTongji)
-            //SGJUserTongji.usdt = afterusdt
-            SGJUserTongji.feeconfigusdt = (Number(SGJUserTongji.feeconfigusdt) +Number(sgjconfig.withdrawfee)).toFixed(2)//下注
-
-            yield SGJUserTongji.saveAsync()
-        }
-        console.warn("304")
-        yield diamondrecord.saveAsync()
-        console.warn("306")
+        SGJUserTongji.usdt = afterusdt
+        SGJUserTongji.feeconfigusdt = (Number(SGJUserTongji.feeconfigusdt) -Number(sgjconfig.withdrawfee)).toFixed(2)//下注
+        record.time = Date.now()
+        record.callBackTime = Date.now()
+        record.msg = data.message
+        record.status = 2
         yield record.saveAsync();
-        console.warn("308")
         yield player.saveAsync()
-        console.warn("310")
+        yield diamondrecord.saveAsync()
+        yield SGJUserTongji.saveAsync()
+        return next(null, { code: C.FAILD, msg: record.msg });
+    }else {
+        return next(null, { code: C.OK,data:{usdt: player.diamond} });
+    }
+});
 
-        var data = yield self.withdrawSubmit(amount-sgjconfig.withdrawfee, targetAddress, player.userId,timestamp,sgjconfig.coinurl)
-        console.warn("Data:",data)
-        if (!data.success) {
-            beforeusdt = player.diamond
-            afterusdt = (Number(player.diamond) + Number(amount)).toFixed(2)
-            player.diamond = (Number(player.diamond)+Number(amount)).toFixed(2)
+proto.withdrawRecord = P.coroutine(function* (msg, session, next) {
+    if (!session.uid) {
+        return next(null, { code: C.ERROR, msg: C.GAME_PARAM_ERROR });
+    }
+    var playerId = msg._id
+    if (!playerId) {
+        return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
+    }
+    var player = yield this.app.models.Player.findByIdAsync(session.uid);
+    if (!player) {
+        return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
+    }
+    if (player.userId != msg._id) {
+        return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
+    }
+    var limit = msg.limit
+    var page = msg.page
+    if (!msg.limit) {
+        limit = 20
+    }
+    if (!msg.page) {
+        page = 0
+    }
+    var skip = Number(page)*Number(limit)
+    var self = this
+    var app = this.app
+    var data = {}
+    let count = yield app.models.UsdtWithdrawRecord.countMongoAsync({ userId: player.userId})
+    data.count = count
+    let records = yield app.models.UsdtWithdrawRecord.findMongoAsync({ userId: player.userId},{},{sort:{submitTime: -1},skip:skip, limit: Number(limit)});
+    data.records = records
+    return next(null, { code: C.OK, data: data });
+});
 
-            var diamondrecord = new app.models.DiamondRecord({
-                _id: uuid.v1(),
-                playerId: player._id,
-                dType: 24,//withdraw fail
-                dSource: beforeusdt ,
-                dSwap: record.amount,
-                dNow: afterusdt,
-                tableId: amount
-            });
-            SGJUserTongji.usdt = afterusdt
-            SGJUserTongji.feeconfigusdt = (Number(SGJUserTongji.feeconfigusdt) -Number(sgjconfig.withdrawfee)).toFixed(2)//下注
-            record.time = Date.now()
-            record.callBackTime = Date.now()
-            record.msg = data.message
-            record.status = 2
-            yield record.saveAsync();
-            yield player.saveAsync()
-            yield diamondrecord.saveAsync()
-            yield SGJUserTongji.saveAsync()
-            return next(null, { code: C.FAILD, msg: record.msg });
-        }else {
-            return next(null, { code: C.OK,data:{usdt: player.diamond} });
-        }
+proto.taskRecord = P.coroutine(function* (msg, session, next) {
+    if (!session.uid) {
+        return next(null, { code: C.ERROR, msg: C.GAME_PARAM_ERROR });
+    }
+    var playerId = msg._id
+    if (!playerId) {
+        return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
+    }
+    var player = yield this.app.models.Player.findByIdAsync(session.uid);
+    if (!player) {
+        return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
+    }
+    if (player.userId != msg._id) {
+        return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
+    }
+    var limit = msg.limit
+    var page = msg.page
+    if (!msg.limit) {
+        limit = 20
+    }
+    if (!msg.page) {
+        page = 0
+    }
+    var skip = Number(page)*Number(limit)
+    var self = this
+    var app = this.app
+    var data = {}
+    let count = yield app.models.SGJTask.countMongoAsync({ userId: player.userId,state: 3 })
+    data.count = count
+    let records = yield app.models.SGJTask.findMongoAsync({  userId: player.userId,state: 3 },{},{sort:{lqTime: -1},skip:skip, limit: Number(limit)});
+    data.records = records
+    return next(null, { code: C.OK, data: data });
+});
+
+proto.sgjRecord = P.coroutine(function* (msg, session, next) {
+    if (!session.uid) {
+        return next(null, { code: C.ERROR, msg: C.GAME_PARAM_ERROR });
+    }
+    var playerId = msg._id
+    if (!playerId) {
+        return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
+    }
+    var player = yield this.app.models.Player.findByIdAsync(session.uid);
+    if (!player) {
+        return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
+    }
+    if (player.userId != msg._id) {
+        return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
+    }
+    var limit = msg.limit
+    var page = msg.page
+    if (!msg.limit) {
+        limit = 20
+    }
+    if (!msg.page) {
+        page = 0
+    }
+    var skip = Number(page)*Number(limit)
+    var app = this.app
+    var data = {}
+    let count = yield app.models.DiamondRecord.countMongoAsync({ playerId: player._id})
+    data.count = count
+    let records = yield app.models.DiamondRecord.findMongoAsync({ playerId: player._id},{},{sort:{registerTime: -1},skip:skip, limit: Number(limit)});
+    data.records = records
+    return next(null, { code: C.OK, data: data });
+});
+
+proto.payRecord = P.coroutine(function* (msg, session, next) {
+    if (!session.uid) {
+        return next(null, { code: C.ERROR, msg: C.GAME_PARAM_ERROR });
+    }
+    var playerId = msg._id
+    if (!playerId) {
+        return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
+    }
+    var player = yield this.app.models.Player.findByIdAsync(session.uid);
+    if (!player) {
+        return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
+    }
+    if (player.userId != msg._id) {
+        return next(null, { code: C.FAILD, msg: C.GAME_PARAM_ERROR });
+    }
+    var limit = msg.limit
+    var page = msg.page
+    if (!msg.limit) {
+        limit = 20
+    }
+    if (!msg.page) {
+        page = 0
+    }
+    var skip = Number(page)*Number(limit)
+    var self = this
+    var app = this.app
+    var data = {}
+    let count = yield app.models.UsdtPayRecord.countMongoAsync({ clientId: player.userid })
+    data.count = count
+    let records = yield app.models.UsdtPayRecord.findMongoAsync({ clientId: player.userId},{},{sort:{timestamp: -1},skip:skip, limit: Number(limit)});
+    data.records = records
+    return next(null, { code: C.OK, data: data });
 });
 
 

+ 2 - 1
app/shuiguo/logic.js

@@ -1331,7 +1331,8 @@ proto.getWJJRRWC = function (_ylrwList,klqhbjl){
     // console.warn("已领任务在当前任务池下标列表  ",ylzsrwList,ylhbrwList);
     let allres = resZSRWS.concat(resHBRWS);
     let allxbs = ylzsrwList.concat(ylhbrwList);
-    for (var i = 0; i < allxbs.length; i++) {
+    //for (var i = 0; i < allxbs.length; i++) {
+    for (var i = 0; i < 3; i++) {
         let info = this.renwuPool[allxbs[i]];
         let item = {
             index: info.index,  //该条任务编号

+ 19 - 16
app/shuiguo/table.js

@@ -497,7 +497,7 @@ proto.setUUID = cor(function* () {
     var app = this.app
     for (; ;){
         return app.memdb.goose.transactionAsync(P.coroutine(function* () {
-            for (var i=0;i<10;i++) {
+            for (var i=0;i<5;i++) {
                 var userId = _.random(100000, 9999999)
 
                 var userIdInfo = yield app.models.UserIds.findMongoAsync({userId: userId})
@@ -776,7 +776,7 @@ proto.zsbgjlAsync = cor(function* (user, chairId) {
             sgjztj.rwdcze3 = 0;  //备用任务兑出总额(领奖时记录)
             sgjztj.rwdcze4 = 0;  //备用任务兑出总额(领奖时记录)
             let cwindx = 0;
-            console.warn("sgjztj.allyzze.length:",sgjztj.allyzze.length," this.allyzze.length:",this.allyzze.length)
+            //console.warn("sgjztj.allyzze.length:",sgjztj.allyzze.length," this.allyzze.length:",this.allyzze.length)
             if(sgjztj.allyzze.length != this.allyzze.length) cwindx = 1;
             if(sgjztj.allydze.length != this.allydze.length) cwindx = 2;
             if(sgjztj.gxzydze.length != this.gxzydze.length) cwindx = 3;
@@ -793,7 +793,6 @@ proto.zsbgjlAsync = cor(function* (user, chairId) {
                 // 下面这两个数据是长度为8的数组,分别代表[苹果,橙子,芒果,铃铛,西瓜,星星,七七,王王]
                 for (var i = 0; i < sgjztj.allyzze.length; i++) {
                     allyzze[i] = sgjztj.allyzze[i] + this.allyzze[i];
-                    console.warn("760 this.allyzze:",this.allyzze)
                 }
                 for (var i = 0; i < sgjztj.allydze.length; i++) {
                     allydze[i] = sgjztj.allydze[i] + this.allydze[i];
@@ -819,7 +818,6 @@ proto.zsbgjlAsync = cor(function* (user, chairId) {
                 sgjztj.gxcxzcs = _.cloneDeep(gxcxzcs);
                 sgjztj.tsxzydze = _.cloneDeep(tsxzydze);
                 sgjztj.tsxcxzcs = _.cloneDeep(tsxcxzcs);
-                console.warn("784 allyzze:",sgjztj.allyzze)
             }
             else{
                 let nowTime = Date.now();
@@ -827,7 +825,6 @@ proto.zsbgjlAsync = cor(function* (user, chairId) {
                 sgjztj.errstr += errstr;
 
             }
-            console.warn("792 sgjztj:",sgjztj)
             yield sgjztj.saveAsync();
             // console.warn("更改总的  ",cwindx,sgjztj);
         }
@@ -944,7 +941,7 @@ proto.readyGameAsync = cor(function* (user) {
     yield this.endResultAsync(endmode);
     let data = {
         state: this.state,
-        win:this.win
+        win:this.win.toFixed(2)
     }
     let str3 = "table 玩家准备222.......id:  "+ this.id + " state: " + data.state ;
     logger.warn(str3);////cssj
@@ -1220,21 +1217,21 @@ proto.dairuAsync = cor(function* (playerId,chairId) {
     this.wjcsDiamond = this.nowDiamond2;//user.diamond;//玩家进入房间初始的钻石数,用于判断离开的时候是否需要记录钻石变更
     // console.warn("玩家进入之后记录初始钻石数   ",this.wjcsDiamond,this.nowDiamond,this.nowDiamond2);
     this.nowDiamond = Number(drCount).toFixed(2);
-    console.warn(" this.nowDiamond2:", this.nowDiamond2, " drCount:",drCount)
+    //console.warn(" this.nowDiamond2:", this.nowDiamond2, " drCount:",drCount)
     this.nowDiamond2 -= Number(drCount);
-    console.warn(" this.nowDiamond2:", this.nowDiamond2)
+    //console.warn(" this.nowDiamond2:", this.nowDiamond2)
     if(this.nowDiamond2 < 0){
         let str4 = "table 带入出错了---id:"+this.id +" 当前局 "+ (this.over+1)+"  nd2  "+this.nowDiamond2;
         logger.warn(str4);////cssj
         return { code: C.FAILD, msg: C.GAME_PARAM_ERROR };
     }
-    console.warn("this.nowDiamond2:",this.nowDiamond2)
-    console.warn("drCount:",drCount)
+    //console.warn("this.nowDiamond2:",this.nowDiamond2)
+    //console.warn("drCount:",drCount)
     var data = {
         diamond: this.nowDiamond2.toFixed(2),
         drCount: drCount,
     }
-    console.warn("data:",data)
+    //console.warn("data:",data)
     return { code: C.OK, data: data };
 });
 
@@ -1624,7 +1621,6 @@ proto.startGameAsync = cor(function* (yazhus) {
     for (var i = 0; i < this.yazhus.length; i++) {
         if(!this.allyzze [i]) this.allyzze [i] = 0;
         this.allyzze [i] += this.yazhus[i]
-        console.warn("1589 this.allyzze:",this.allyzze)
     }
     for (var i = 0; i < winList.length; i++) {
         if(!this.allydze [i]) this.allydze [i] = 0;
@@ -2457,7 +2453,7 @@ proto.upZFBInfoAsync = cor(function* (playerId,realName,zfbAcc) {
 
 // 得到任务列表
 proto.getTaskInfoAsync = cor(function* (playerId,chairId) {
-    console.log("玩家信息玩家信息玩家信息");
+    //console.log("玩家信息玩家信息玩家信息");
     var user = this.users[chairId];
     if (!user) {
         return { code: C.FAILD, msg: C.GAME_PARAM_ERROR };
@@ -2479,7 +2475,7 @@ proto.getTaskInfoAsync = cor(function* (playerId,chairId) {
         state:{ $lte: 2}//已领未发奖完成
     };
     var ylwwcrwList = yield this.app.models.SGJTask.findMongoAsync(opts0, 'des cost reachs reachC rewardt rewards state');
-    // console.warn("该wanjia已领取未完成或未发奖的列表   length   "+ylwwcrwList.length+"   ylrwList  "+JSON.stringify(ylwwcrwList))
+    console.warn("该wanjia已领取未完成或未发奖的列表   length   "+ylwwcrwList.length+"   ylrwList  "+JSON.stringify(ylwwcrwList))
     let jrStart = this.logic.getTodaySJC();////更新今日0时的时间戳
     let opts1 = {
         playerId: playerId,
@@ -2487,9 +2483,9 @@ proto.getTaskInfoAsync = cor(function* (playerId,chairId) {
         wcTime:{ $gte: jrStart, $lt: jrStart+86400000}
     };
     var jrywcrwList = yield this.app.models.SGJTask.findMongoAsync(opts1, 'des cost reachs reachC rewardt rewards state');
-    // console.warn("该wanjia今日已完成的列表   length   "+jrywcrwList.length+"   jrywcrwList  "+JSON.stringify(jrywcrwList))
+    //console.warn("该wanjia今日已完成的列表   length   "+jrywcrwList.length+"   jrywcrwList  "+JSON.stringify(jrywcrwList))
     var ylrwList = ylwwcrwList.concat(jrywcrwList);
-    // console.warn("该wanjia已经领取的列表   length   "+ylrwList.length+"   ylrwList  "+JSON.stringify(ylrwList))
+    //console.warn("该wanjia已经领取的列表   length   "+ylrwList.length+"   ylrwList  "+JSON.stringify(ylrwList))
     let klqhbjl = 0;//该玩家还可以领取的红包奖励
     var sgjUser = yield this.app.models.SGJUser.findByIdAsync(playerId, 'taskReward jxzReward jzjrldzcz');
     if (sgjUser) {
@@ -2500,13 +2496,17 @@ proto.getTaskInfoAsync = cor(function* (playerId,chairId) {
             klqhbjl = 0;
         }
     }
+    klqhbjl = 0
+    //console.warn("klqhbjl:",klqhbjl)
     let rwcList = [];
     var sgjwjjrrwc = yield this.app.models.SGJWJJRRWC.findByIdAsync(playerId, '_id time rwcList');
     if (sgjwjjrrwc) {
         if(sgjwjjrrwc.time == jrStart) {
+            console.warn("2506 sgjwjjrrwc.rwcList.length:",sgjwjjrrwc.rwcList.length )
             rwcList = this.logic.deepCloneTL2(sgjwjjrrwc.rwcList);
         }
         else{
+            console.warn("2510 ylrwList.length:",ylrwList.length, " klqhbjl:",klqhbjl)
             rwcList = this.logic.getWJJRRWC(ylrwList,klqhbjl);
             sgjwjjrrwc.rwcList = [];
             sgjwjjrrwc.rwcList = this.logic.deepCloneTL2(rwcList);
@@ -2516,6 +2516,7 @@ proto.getTaskInfoAsync = cor(function* (playerId,chairId) {
 
     }
     else{
+        console.warn("2520 ylrwList.length:",ylrwList.length," klqhbjl",klqhbjl )
         rwcList = this.logic.getWJJRRWC(ylrwList,klqhbjl);
         var newsgjwjjrrwc = new this.app.models.SGJWJJRRWC({
             _id: this.ownerId,  // 标识,玩家的_id
@@ -2524,10 +2525,12 @@ proto.getTaskInfoAsync = cor(function* (playerId,chairId) {
         });
         yield newsgjwjjrrwc.saveAsync();
     }
+    console.warn("ylrwList.length:",ylrwList.length, " rwcList.length:",rwcList.length)
     let allRenWuInfo = this.logic.getTasksInfo(ylrwList,rwcList)//该任务最多领取次数
     var data = {
         renwuPool: allRenWuInfo,
     }
+    //console.warn("data:",data.renwuPool.length)
     return { code: C.OK, data: data };
 });
 

+ 7 - 8
http/charge.js

@@ -40,14 +40,14 @@ var proto = Controller.prototype;
 // 路由函数
 proto.route = function (pathname) {
 	switch (pathname) {
-		case '/withdrawstart.nd': return (query, method, res) => this.withdrawstartAsync(query, method, res);//充值开始
+		//case '/withdrawstart.nd': return (query, method, res) => this.withdrawstartAsync(query, method, res);//充值开始
 		case '/clear.nd': return (query, method, res) => this.clearAsync(query, method, res);//充值开始
-		case '/taskRecord.nd': return (query, method, res) => this.taskRecordAsync(query, method, res);//充值开始
-		case '/withdrawrecord.nd': return (query, method, res) => this.withdrawRecordAsync(query, method, res);//充值开始
-		case '/sgjrecord.nd': return (query, method, res) => this.sgjRecordAsync(query, method, res);//充值开始
-		case '/payrecord.nd': return (query, method, res) => this.payRecordAsync(query, method, res);//充值开始
+		//case '/taskRecord.nd': return (query, method, res) => this.taskRecordAsync(query, method, res);//充值开始
+		//case '/withdrawrecord.nd': return (query, method, res) => this.withdrawRecordAsync(query, method, res);//充值开始
+		///case '/sgjrecord.nd': return (query, method, res) => this.sgjRecordAsync(query, method, res);//充值开始
+		//case '/payrecord.nd': return (query, method, res) => this.payRecordAsync(query, method, res);//充值开始
 		case '/withdrawok.nd': return (query, method, res) => this.withdrawOkAsync(query, method, res);//充值成功
-		case '/paystart.nd': return (query, method, res) => this.payStartAsync(query, method, res);//充值开始
+		//case '/paystart.nd': return (query, method, res) => this.payStartAsync(query, method, res);//充值开始
 		case '/getUsdtAddress.nd': return (query, method, res) => this.payUsdtLoctionAsync(query, method, res);//充值开始
 		case '/payok.nd': return (query, method, res) => this.payOkAsync(query, method, res);//充值成功
 		case '/setopenid.nd': return (query, method, res) => this.setOpenIdAsync(query, method, res);//设置公众号openid
@@ -656,7 +656,6 @@ proto.withdrawstartAsync = P.coroutine(function* (query, method, res){
 
 	return app.memdb.goose.transactionAsync(P.coroutine(function* () {
 		var timestamp = Date.now()
-		console.warn("sgjconfig:",sgjconfig)
 		var record = new app.models.UsdtWithdrawRecord({
 			_id: uuid.v1(),                                  // 订单号
 			chainCode: "tron",                                 // 玩家ID
@@ -1045,7 +1044,7 @@ proto.withdrawRecordAsync = P.coroutine(function* (query, method, res) {
 		if (players.length == 0) {
 			response.code = "1"
 			response.message = "user not exist"
-			return this.writeOut(response, res);
+			return self.writeOut(response, res);
 		}
 		var player = players[0]
 		let count = yield app.models.UsdtWithdrawRecord.countMongoAsync({ userId: player.userId})