第三方登录扣款

app/models/hall.js

@@ -55,31 +55,33 @@ module.exports = function (app) {
 
     mdbgoose.model('UsdtPayRecord', UsdtPayRecordSchema);
 
-    var FishUSDTRecordSchema = new mdbgoose.Schema({
+    var ThirdUSDTRecordSchema = new mdbgoose.Schema({
         _id: { type: String },                                      // 订单号
         userId: {type: Number},
         trade_no: { type: String },
         is_refund: { type: Number , default: 0},
+        gameType:{type: Number , default: 0},
         dSource: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },              // 原钻石
         dSwap: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },                // 变化钻石 游戏
         dNow: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },                 // 新钻石
         timestamp: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },                    // 充值奖励
-    }, { collection: 'fishUSDTRecord' });
+    }, { collection: 'thirdUSDTRecord' });
 
-    mdbgoose.model('FishUSDTRecord', FishUSDTRecordSchema);
+    mdbgoose.model('ThirdUSDTRecord', ThirdUSDTRecordSchema);
 
-    var FishRefundUSDTRecordSchema = new mdbgoose.Schema({
+    var ThirdRefundUSDTRecordSchema = new mdbgoose.Schema({
         _id: { type: String },                                      // 订单号
         userId: {type: Number},
         trade_no: { type: String },
+        gameType:{type: Number , default: 0},
         is_refund: { type: Number , default: 0},
         dSource: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },              // 原钻石
         dSwap: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },                // 变化钻石 游戏
         dNow: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },                 // 新钻石
         timestamp: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },                    // 充值奖励
-    }, { collection: 'fishRefundUSDTRecord' });
+    }, { collection: 'thirdRefundUSDTRecord' });
 
-    mdbgoose.model('FishRefundUSDTRecord', FishRefundUSDTRecordSchema);
+    mdbgoose.model('ThirdRefundUSDTRecord', ThirdRefundUSDTRecordSchema);
 
     var UsdtWithdrawRecordSchema = new mdbgoose.Schema({
         _id: { type: String },                                      // 订单号

app/models/player.js

@@ -104,6 +104,7 @@ module.exports = function (app) {
             19比赛4~10名送钻,20水果游戏,21水果任务,22水果排行榜,  只有11没有统计
         */
         dType: { type: Number },
+        gameType: { type: Number },
         dSource: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },              // 原钻石
         dSwap: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },                // 变化钻石 游戏
         dNow: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },                 // 新钻石

http/charge.js

@@ -735,13 +735,13 @@ proto.deductUsdtAsync = P.coroutine(function* (query, method, res){var response
 	var self = this
 	var app = this.app
 	return app.memdb.goose.transactionAsync(P.coroutine(function* () {
-		var records = yield app.models.FishUSDTRecord.findMongoAsync({ trade_no: trade_no });
+		var records = yield app.models.ThirdUSDTRecord.findMongoAsync({gameType:query["game_type"], trade_no: trade_no });
 		if (records.length > 0) {
 			response.code = 401
 			response.message = "already exist"
 			return self.writeOut(response, res);
 		}
-		var record = new app.models.FishUSDTRecord({
+		var record = new app.models.ThirdUSDTRecord({
 			_id: uuid.v1(),                                  // 订单号
 			userId: userid,
 			trade_no: trade_no,
@@ -749,6 +749,7 @@ proto.deductUsdtAsync = P.coroutine(function* (query, method, res){var response
 			dSwap: 0-usdt_amount,
 			dNow:player.diamond - usdt_amount,
 			timestamp: Date.now(),
+			gameType:query["game_type"]
 		});
 		player.diamond -= usdt_amount
 		response.usdt = player.diamond
@@ -759,7 +760,8 @@ proto.deductUsdtAsync = P.coroutine(function* (query, method, res){var response
 			dSource: player.diamon ,
 			dSwap: 0-usdt_amount,
 			dNow: player.diamond - usdt_amount,
-			tableId: -amount
+			tableId: -amount,
+			gameType:query["game_type"],
 		});
 		yield diamondrecord.saveAsync()
 		yield record.saveAsync()
@@ -767,7 +769,7 @@ proto.deductUsdtAsync = P.coroutine(function* (query, method, res){var response
 		return self.writeOut(response, res);
 	}), app.getServerId())
 		.then(() => app.event.emit('transactionSuccess'), () => app.event.emit('transactionFail'));
-	return this.writeOut(response, res);
+
 })
 
 proto.addUsdtAsync = P.coroutine(function* (query, method, res){var response = {}
@@ -818,13 +820,13 @@ proto.addUsdtAsync = P.coroutine(function* (query, method, res){var response = {
 	var self = this
 	var app = this.app
 	return app.memdb.goose.transactionAsync(P.coroutine(function* () {
-		var records = yield app.models.FishUSDTRecord.findMongoAsync({ trade_no: trade_no });
+		var records = yield app.models.ThirdUSDTRecord.findMongoAsync({gameType:query["game_type"], trade_no: trade_no });
 		if (records.length > 0) {
 			response.code = 401
 			response.message = "already exist"
 			return self.writeOut(response, res);
 		}
-		var record = new app.models.FishUSDTRecord({
+		var record = new app.models.ThirdUSDTRecord({
 			_id: uuid.v1(),                                  // 订单号
 			userId: userid,
 			trade_no: trade_no,
@@ -832,6 +834,7 @@ proto.addUsdtAsync = P.coroutine(function* (query, method, res){var response = {
 			dSwap: usdt_amount,
 			dNow:player.diamond + usdt_amount,
 			timestamp: Date.now(),
+			gameType:query["game_type"],
 		});
 		player.diamond += usdt_amount
 		response.usdt = player.diamond
@@ -842,7 +845,8 @@ proto.addUsdtAsync = P.coroutine(function* (query, method, res){var response = {
 			dSource: player.diamond,
 			dSwap: usdt_amount,
 			dNow: player.diamond + usdt_amount,
-			tableId: -amount
+			tableId: -amount,
+			gameType:query["game_type"],
 		});
 		yield diamondrecord.saveAsync()
 		yield record.saveAsync()
@@ -850,7 +854,7 @@ proto.addUsdtAsync = P.coroutine(function* (query, method, res){var response = {
 		return self.writeOut(response, res);
 	}), app.getServerId())
 		.then(() => app.event.emit('transactionSuccess'), () => app.event.emit('transactionFail'));
-	return this.writeOut(response, res);
+
 })
 
 proto.refundUsdtAsync = P.coroutine(function* (query, method, res){var response = {}
@@ -912,7 +916,7 @@ proto.refundUsdtAsync = P.coroutine(function* (query, method, res){var response
 	var self = this
 	var app = this.app
 	return app.memdb.goose.transactionAsync(P.coroutine(function* () {
-		var records = yield this.app.models.FishUSDTRecord.findMongoAsync({ trade_no: origin_trade_no });
+		var records = yield this.app.models.ThirdUSDTRecord.findMongoAsync({gameType:query["game_type"], trade_no: origin_trade_no });
 		if (records.length == 0 ) {
 			response.code = 401
 			response.message = "trade_no not exist"
@@ -929,7 +933,7 @@ proto.refundUsdtAsync = P.coroutine(function* (query, method, res){var response
 			response.message = "trade_no not exist"
 			return self.writeOut(response, res);
 		}
-		var fishRefundRecord = new app.models.FishRefundUSDTRecord({
+		var thirdRefundRecord = new app.models.ThirdRefundUSDTRecord({
 			_id: uuid.v1(),                                  // 订单号
 			userId: userid,
 			trade_no: trade_no,
@@ -938,6 +942,7 @@ proto.refundUsdtAsync = P.coroutine(function* (query, method, res){var response
 			dSwap: usdt_amount,
 			dNow:player.diamond + usdt_amount,
 			timestamp: Date.now(),
+			gameType:query["game_type"]
 		});
 		var diamondrecord = new app.models.DiamondRecord({
 			_id: uuid.v1(),
@@ -946,12 +951,13 @@ proto.refundUsdtAsync = P.coroutine(function* (query, method, res){var response
 			dSource: player.diamon ,
 			dSwap: usdt_amount,
 			dNow: player.diamond + usdt_amount,
-			tableId: -amount
+			tableId: -amount,
+			gameType:query["game_type"],
 		});
 		yield diamondrecord.saveAsync()
 		player.diamond += usdt_amount
 		response.usdt = player.diamond
-		yield fishRefundRecord.saveAsync()
+		yield thirdRefundRecord.saveAsync()
 		yield player.saveAsync()
 		return self.writeOut(response, res);
 	}), app.getServerId())