|
|
@@ -139,13 +139,18 @@ class OrderClass extends BaseClass
|
|
|
foreach ($orderList as $key => $orderInfo) {
|
|
|
|
|
|
$book = $orderInfo['book'] ?? 0;
|
|
|
+ $actPrice = $orderInfo['actPrice'] ?? 0;
|
|
|
$status = $orderInfo['status'] ?? 0;
|
|
|
if ($book == 1 && $status == 2) {
|
|
|
//预订单待发货的不算收入
|
|
|
unset($orderList[$key]);
|
|
|
continue;
|
|
|
}
|
|
|
- if ($status == 0 || $status == 5) {
|
|
|
+ if ($status == 1 || $status == 5) {
|
|
|
+ unset($orderList[$key]);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if ($actPrice <= 0) {
|
|
|
unset($orderList[$key]);
|
|
|
continue;
|
|
|
}
|