|
@@ -293,7 +293,7 @@ class Order
|
|
|
|
|
|
# 确认收货
|
|
# 确认收货
|
|
public function finish_commit(){}
|
|
public function finish_commit(){}
|
|
- public function finish($type = 1, $order, $yes = false, $uid = false)
|
|
|
|
|
|
+ public function finish($type = 1, $order = [], $yes = false, $uid = false)
|
|
{
|
|
{
|
|
if ($yes || ($order['status'] >= 3 && $order['status'] <= 4)) {
|
|
if ($yes || ($order['status'] >= 3 && $order['status'] <= 4)) {
|
|
if ($type == 1) {
|
|
if ($type == 1) {
|