|
|
@@ -160,12 +160,14 @@ class Order extends BaseModel
|
|
|
$settleDays = Setting::getItem('settlement', $order['wxapp_id'])['settle_days'];
|
|
|
// 判断该订单是否满足结算时间 (订单完成时间 + 佣金结算时间) ≤ 当前时间
|
|
|
$deadlineTime = $order['receipt_time'] + ((int)$settleDays * 86400);
|
|
|
+ var_dump($deadlineTime);
|
|
|
if ($settleDays > 0 && $deadlineTime > time()) {
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
// 分销订单详情
|
|
|
$model = \app\common\model\Order::detail(['order_id'=>$order['order_id']]);
|
|
|
+ var_dump($model);
|
|
|
if (!$model || $model['is_settled'] == 1) {
|
|
|
return false;
|
|
|
}
|