Commit 96eda6c2 authored by 李尚科's avatar 李尚科

fix

parent a6eaeb12
Pipeline #14341 passed with stage
in 12 seconds
...@@ -61,18 +61,18 @@ class OrderService extends Service { ...@@ -61,18 +61,18 @@ class OrderService extends Service {
async updateOrderStateToOverdue(order) { async updateOrderStateToOverdue(order) {
const { ctx } = this; const { ctx } = this;
const { id, order_time, state, pay_status } = order; let { id, order_time, state, pay_status, state_time } = order;
if (!id || !order_time || !state || typeof (pay_status) === 'undefined') { if (!id || !order_time || !state || typeof (pay_status) === 'undefined') {
return order; return order;
} }
const expire_time = moment(order_time).valueOf() + 24 * 3600 * 1000; const expire_time = moment(order_time).valueOf() + 24 * 3600 * 1000;
const now_time = moment().valueOf(); const now_time = moment().valueOf();
const state_time = moment().format('YYYY-MM-DD HH:mm:ss'); if (['支付中'].includes(state) && moment(state_time).valueOf() + 300 < now_time) {
if (state === '支付中' && pay_status === 0 && moment(order_time).valueOf() * 300 < now_time) {
await this.logOrder(id); await this.logOrder(id);
await ctx.prometheusModel.CreditOrder.update({ state: '待支付', state_time: state_time }, { where: { id } }); await ctx.prometheusModel.CreditOrder.update({ state: '待支付', state_time: state_time }, { where: { id } });
} }
if (expire_time < now_time && (state === '待支付' || state === '已取消' || state === '支付中') && pay_status === 0) { state_time = moment().format('YYYY-MM-DD HH:mm:ss');
if (expire_time < now_time && ['待支付', '已取消', '支付中'].includes(state)) {
await this.logOrder(id); await this.logOrder(id);
const ret = await ctx.prometheusModel.CreditOrder.update({ state: '已失效', state_time: state_time }, { where: { id } }); const ret = await ctx.prometheusModel.CreditOrder.update({ state: '已失效', state_time: state_time }, { where: { id } });
if (ret && ret[0]) { if (ret && ret[0]) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment