|
@@ -372,10 +372,14 @@ class PayOrdersService extends BaseService
|
|
|
return ['code' => 1, 'msg' => '订单不存在'];
|
|
return ['code' => 1, 'msg' => '订单不存在'];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if ($order->bonus_settle != 1) {
|
|
|
|
|
|
|
+ if ($order->bonus_settle == 1) {
|
|
|
return ['code' => 1, 'msg' => '佣金收益已结算'];
|
|
return ['code' => 1, 'msg' => '佣金收益已结算'];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if ($order->status != 4) {
|
|
|
|
|
+ return ['code' => 1, 'msg' => '订单未完成'];
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
RedisService::set($cacheLockKey, $order, rand(10,20));
|
|
RedisService::set($cacheLockKey, $order, rand(10,20));
|
|
|
DB::beginTransaction();
|
|
DB::beginTransaction();
|
|
|
|
|
|