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