xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支付：代金券功能

Browse Source
This commit is contained in:
luying
2022-07-11 18:08:00 +08:00
parent b9af56fd07
commit ae369f7bf2
14 changed files with 179 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/orderService.ts
+19 -2
View File
@@ -175,7 +175,7 @@ export async function settleOrder(order: UserOrderModelType, serverId: number, s
let result = await makeOrder(order, sid);
if (result.code !== 0) {//结算失败
console.log(`支付失败..... ${JSON.stringify(result)}`)
reportTAEvent(order.roleId, TA_EVENT.RECHARGE_FAIL, { pay_id: order.localOrderID, charge_id: order.productID, pay_name: order.message, pay_amount: order.price, pay_channel: order.payType })
reportTAEvent(order.roleId, TA_EVENT.RECHARGE_FAIL, { pay_id: order.localOrderID, charge_id: order.productID, pay_name: order.message, pay_amount: order.price, pay_channel: order.payType, pay_type: order.useVoucher? "现金": "代金券" })
savePayLog(order);
return resResult(result);
}
@@ -188,7 +188,7 @@ export async function settleOrder(order: UserOrderModelType, serverId: number, s
//成长任务
await checkTask(serverId, order.roleId, sid, TASK_TYPE.ACTIVITY_RMB, { count: order.price });
if(order.payType != PAY_TYPE.TEST) {
reportTAEvent(order.roleId, TA_EVENT.RECHARGE_SUCCESS, { pay_id: order.localOrderID, charge_id: order.productID, pay_name: order.message, pay_amount: order.price, pay_channel: order.payType })
reportTAEvent(order.roleId, TA_EVENT.RECHARGE_SUCCESS, { pay_id: order.localOrderID, charge_id: order.productID, pay_name: order.message, pay_amount: order.price, pay_channel: order.payType, pay_type: order.useVoucher? "现金": "代金券" })
reportTAUserSet(TA_USERSET_TYPE.SET_ONCE, order.roleId, { first_pay_time: new Date() });
reportTAUserSet(TA_USERSET_TYPE.SET, order.roleId, { last_pay_time: new Date() });
reportTAUserSet(TA_USERSET_TYPE.ADD, order.roleId, { total_revenue: order.price });
@@ -291,6 +291,23 @@ export async function settleOrderFromRedisPub(message: string) {
return true
}
export async function settleOrderFromHandler(localOrderID: string, roleId: string, serverId: number, sid: string ) {
let order = await UserOrderModel.findOrder(localOrderID);
if(!order || order.state != ORDER_STATE.APPLY) {
return STATUS.DUPLICATE_ORDER;
}
if(order.roleId != roleId) {
console.log('订单玩家错误');
return STATUS.ORDER_STATUS_ERROR;
}
let result = await settleOrder(order, serverId, sid);
await UserOrderModel.saveOrderID(order.roleId, order.localOrderID, '', JSON.stringify(result));
return STATUS.SUCCESS
}
export async function refundOrderFromRedisPub(message: string) {
console.log('**********refundOrderFromRedisPub*******')
console.log('message: ', message);