|
|
@@ -339,9 +339,9 @@ class Order extends Model |
|
|
|
$orderBy = 'have_received'; |
|
|
|
break; |
|
|
|
case self::TYPE_REFUND: |
|
|
|
$condition['have_paid'] = ['>', self::PAID_NO]; |
|
|
|
$condition['status'] = ['=', self::STATUS_REFUND]; |
|
|
|
$condition['refund_status'] = ['<>', self::REFUND_STATUS_AGREE]; |
|
|
|
// $condition['have_paid'] = ['>', self::PAID_NO]; |
|
|
|
$condition['status'] = ['in', [self::STATUS_REFUND,self::STATUS_CANCEL]]; |
|
|
|
// $condition['refund_status'] = ['<>', self::REFUND_STATUS_AGREE]; |
|
|
|
$orderBy = 'createtime'; |
|
|
|
break; |
|
|
|
default: //全部 |
|
|
|