充值:添加充值前检查
This commit is contained in:
@@ -7,7 +7,7 @@ import _ = require('underscore');
|
||||
import { applyOrderWX, checkOrderWX } from '../../../services/pay/weixinPay';
|
||||
import { applyOrderALI, checkOrderALI } from '../../../services/pay/aliPay';
|
||||
import { applyOrder37 } from '../../../services/pay/37Pay';
|
||||
import { settleOrder, settleOrderAli, settleOrderWx } from '../../../services/orderService';
|
||||
import { checkOrderCanBuy, settleOrder, settleOrderAli, settleOrderWx } from '../../../services/orderService';
|
||||
import { addRechargeMoney } from '../../../services/activity/rechargeMoneyService';
|
||||
import { addVipRechargeMoney } from '../../../services/activity/vipRechargeMoneyService';
|
||||
import { getActivityById } from '../../../services/activity/activityService';
|
||||
@@ -100,6 +100,14 @@ export class orderHandler {
|
||||
console.log('未知支付类型');
|
||||
return resResult(STATUS.NO_PAY_TYPE);
|
||||
}
|
||||
|
||||
if(activityId > 0) {
|
||||
let activityData = await getActivityById(activityId);
|
||||
let check = await checkOrderCanBuy(roleId, serverId, activityData, productID, paramStr);
|
||||
if(!check) return resResult(STATUS.ORDER_CANNOT_BUY)
|
||||
}
|
||||
|
||||
|
||||
await UserOrderModel.applyOrder(serverId, roleId, productID, localOrderID, orderID, price, payType, activityId, paramStr, message);
|
||||
reportTAEvent(roleId, TA_EVENT.RECHARGE, {
|
||||
pay_id: localOrderID, chargeId: productID, pay_name: message, pay_amount: price, pay_channel: payType
|
||||
@@ -232,6 +240,9 @@ export class orderHandler {
|
||||
// }
|
||||
let activityData = await getActivityById(activityId);
|
||||
if (!activityData) return resResult(STATUS.ACTIVITY_MISSING);
|
||||
let check = await checkOrderCanBuy(roleId, serverId, activityData, productID, paramStr);
|
||||
if(!check) return resResult(STATUS.ORDER_CANNOT_BUY)
|
||||
|
||||
let orderInfo = await UserOrderModel.applyOrder(serverId, roleId, productID, localOrderID, orderID, price, payType, activityId, paramStr, message);
|
||||
|
||||
//订单成功
|
||||
|
||||
Reference in New Issue
Block a user