|
@@ -477,14 +477,14 @@ class Order extends Model
|
|
|
$condition['status'] = ['=', self::STATUS_NORMAL];
|
|
|
$orderBy = 'have_paid';
|
|
|
break;*/
|
|
|
- case self::TYPE_RECEIVE: //3=待核销
|
|
|
+ case self::TYPE_HEXIAO: //3=待核销
|
|
|
$condition['have_paid'] = ['>', self::PAID_NO];
|
|
|
$condition['have_delivered'] = ['>', self::DELIVERED_NO];
|
|
|
$condition['have_hexiao'] = ['=', self::HEXIAO_NO];
|
|
|
$condition['status'] = ['=', self::STATUS_NORMAL];
|
|
|
$orderBy = 'have_delivered';
|
|
|
break;
|
|
|
- case self::TYPE_HEXIAO: //4=已核销,待收货
|
|
|
+ case self::TYPE_RECEIVE: //4=已核销,待收货
|
|
|
$condition['have_paid'] = ['>', self::PAID_NO];
|
|
|
$condition['have_delivered'] = ['>', self::DELIVERED_NO];
|
|
|
$condition['have_hexiao'] = ['>', self::HEXIAO_NO];
|