支付:结算顺序

This commit is contained in:
luying
2022-05-18 19:57:13 +08:00
parent 2b9e9f7e29
commit 914561a1d7

View File

@@ -162,7 +162,7 @@ export async function makeOrder(orderInfo: UserOrderModelType, sid: string) {
await recordFirstGift(roleInfo, orderInfo.serverId);
}
sendMessageToUserWithSuc(roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { totalPay: roleInfo.totalPay }, sid);
await sendMessageToUserWithSuc(roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { totalPay: roleInfo.totalPay }, sid);
return {...rewardResult, roleInfo}
}
@@ -182,17 +182,10 @@ export async function settleOrder(order: UserOrderModelType, serverId: number, s
}
//推送
console.log('***** settleOrder', order.roleId, sid)
if(!!sid) {
sendMessageToUserWithSuc(order.roleId, PUSH_ROUTE.ORDER, {
...result.data,
price: order.price,
state: order.state,
localOrderID: order.localOrderID}, sid);
}
//活动统计
addRechargeMoney(order.roleId, serverId, order.price);
addVipRechargeMoney(order.roleId, serverId, order.price);
addGuildPay(result.roleInfo, order.price)
await addRechargeMoney(order.roleId, serverId, order.price);
await addVipRechargeMoney(order.roleId, serverId, order.price);
await addGuildPay(result.roleInfo, order.price)
//成长任务
await checkTask(serverId, order.roleId, sid, TASK_TYPE.ACTIVITY_RMB, { count: order.price });
if(order.payType != PAY_TYPE.TEST) {
@@ -202,6 +195,13 @@ export async function settleOrder(order: UserOrderModelType, serverId: number, s
reportTAUserSet(TA_USERSET_TYPE.ADD, order.roleId, { total_revenue: order.price });
}
savePayLog(order);
if(!!sid) {
sendMessageToUserWithSuc(order.roleId, PUSH_ROUTE.ORDER, {
...result.data,
price: order.price,
state: order.state,
localOrderID: order.localOrderID}, sid);
}
return result.data;
}