支付:结算顺序
This commit is contained in:
@@ -162,7 +162,7 @@ export async function makeOrder(orderInfo: UserOrderModelType, sid: string) {
|
|||||||
await recordFirstGift(roleInfo, orderInfo.serverId);
|
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}
|
return {...rewardResult, roleInfo}
|
||||||
}
|
}
|
||||||
@@ -182,17 +182,10 @@ export async function settleOrder(order: UserOrderModelType, serverId: number, s
|
|||||||
}
|
}
|
||||||
//推送
|
//推送
|
||||||
console.log('***** settleOrder', order.roleId, sid)
|
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);
|
await addRechargeMoney(order.roleId, serverId, order.price);
|
||||||
addVipRechargeMoney(order.roleId, serverId, order.price);
|
await addVipRechargeMoney(order.roleId, serverId, order.price);
|
||||||
addGuildPay(result.roleInfo, order.price)
|
await addGuildPay(result.roleInfo, order.price)
|
||||||
//成长任务
|
//成长任务
|
||||||
await checkTask(serverId, order.roleId, sid, TASK_TYPE.ACTIVITY_RMB, { count: order.price });
|
await checkTask(serverId, order.roleId, sid, TASK_TYPE.ACTIVITY_RMB, { count: order.price });
|
||||||
if(order.payType != PAY_TYPE.TEST) {
|
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 });
|
reportTAUserSet(TA_USERSET_TYPE.ADD, order.roleId, { total_revenue: order.price });
|
||||||
}
|
}
|
||||||
savePayLog(order);
|
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;
|
return result.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user