|
@@ -26,7 +26,7 @@ class WechatOrderCron
|
|
|
'o.shipping_status' => 1
|
|
'o.shipping_status' => 1
|
|
|
])
|
|
])
|
|
|
->where(function (Query $query) {
|
|
->where(function (Query $query) {
|
|
|
- $query->where('w.order_state', 1)
|
|
|
|
|
|
|
+ $query->whereIn('w.order_state', [1,2])
|
|
|
->whereOr('w.order_state', null);
|
|
->whereOr('w.order_state', null);
|
|
|
})
|
|
})
|
|
|
->field('p.id,w.order_state')
|
|
->field('p.id,w.order_state')
|
|
@@ -34,7 +34,7 @@ class WechatOrderCron
|
|
|
if ($payment->order_state === null) {
|
|
if ($payment->order_state === null) {
|
|
|
$this->paymentRecordService->createWechatOrder($payment->id);
|
|
$this->paymentRecordService->createWechatOrder($payment->id);
|
|
|
} else {
|
|
} else {
|
|
|
- // 发货 todo
|
|
|
|
|
|
|
+ $this->paymentRecordService->updateWechatOrder($payment->id);
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|