订单列表状态

addons/unishop/model/Order.php

@@ -170,10 +170,10 @@ class Order extends Model
             /*case $data['have_delivered'] == self::DELIVERED_NO && $data['status'] == self::STATUS_NORMAL:
                 $state = self::TYPE_DELIVES;
                 break;*/
-            case $data['have_received'] == self::RECEIVED_NO && $data['status'] == self::STATUS_NORMAL:
+            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_commented'] == self::COMMENTED_NO && $data['status'] == self::STATUS_NORMAL:
+            case $data['have_paid'] != self::PAID_NO && $data['have_received'] != self::RECEIVED_NO && $data['status'] == self::STATUS_NORMAL:
                 $state = self::TYPE_COMMENT;
                 break;
 /*            case $data['status'] == self::STATUS_REFUND && $data['refund_status'] == self::REFUND_STATUS_AGREE: // TODO 申请退款并且已通过同意，则订单为关闭状态