|
|
@@ -71,8 +71,9 @@ class Order extends Model
|
|
|
const TYPE_PAY = 1; // 待付款
|
|
|
// const TYPE_DELIVES = 2; // 待发货
|
|
|
const TYPE_RECEIVE = 3; // 待核销
|
|
|
- const TYPE_COMMENT = 4; // 已完成
|
|
|
+ const TYPE_FINISH = 4; // 已完成
|
|
|
const TYPE_NOCOMMENT = 40; // 待评价
|
|
|
+ const TYPE_COMMENTED = 41; // 已评价
|
|
|
// const TYPE_REFUND = 5; // 售后
|
|
|
// const TYPE_REFUSE = 6; // 拒绝退款
|
|
|
// const TYPE_OFF = 9; // 订单关闭
|
|
|
@@ -174,11 +175,11 @@ class Order extends Model
|
|
|
case $data['have_paid'] != self::PAID_NO && $data['have_received'] == self::RECEIVED_NO && $data['status'] == self::STATUS_NORMAL:
|
|
|
$state = self::TYPE_RECEIVE;
|
|
|
break;
|
|
|
- case $data['have_paid'] != self::PAID_NO && $data['have_received'] != self::RECEIVED_NO && $data['status'] == self::STATUS_NORMAL:
|
|
|
- $state = self::TYPE_COMMENT;
|
|
|
+ case $data['have_paid'] != self::PAID_NO && $data['have_received'] != self::RECEIVED_NO && $data['have_commented'] == self::COMMENTED_NO && $data['status'] == self::STATUS_NORMAL:
|
|
|
+ $state = self::TYPE_NOCOMMENT;
|
|
|
break;
|
|
|
case $data['have_paid'] != self::PAID_NO && $data['have_received'] != self::RECEIVED_NO && $data['have_commented'] != self::COMMENTED_NO && $data['status'] == self::STATUS_NORMAL:
|
|
|
- $state = self::TYPE_NOCOMMENT;
|
|
|
+ $state = self::TYPE_COMMENTED;
|
|
|
break;
|
|
|
case $data['status'] == self::STATUS_CANCEL:
|
|
|
$state = self::TYPE_CANCEL;
|
|
|
@@ -202,7 +203,7 @@ class Order extends Model
|
|
|
$data = [
|
|
|
1 => '待付款',
|
|
|
3 => '待核销',
|
|
|
- 4 => '已完成',
|
|
|
+ 41 => '已评价',
|
|
|
40 => '待评价',
|
|
|
20 => '已取消',
|
|
|
];
|
|
|
@@ -363,7 +364,7 @@ class Order extends Model
|
|
|
$condition['status'] = ['=', self::STATUS_NORMAL];
|
|
|
$orderBy = 'have_delivered';
|
|
|
break;
|
|
|
- case self::TYPE_COMMENT: //4=已完成
|
|
|
+ case self::TYPE_FINISH: //4=已完成
|
|
|
$condition['have_paid'] = ['>', self::PAID_NO];
|
|
|
$condition['have_delivered'] = ['>', self::DELIVERED_NO];
|
|
|
$condition['have_received'] = ['>', self::RECEIVED_NO];
|
lizhen_gitee