Commit c5752ec7 by Sixong.Zhu

update

parent db961f12
Showing with 3 additions and 0 deletions
...@@ -138,16 +138,19 @@ class OrderService { ...@@ -138,16 +138,19 @@ class OrderService {
r.pageData.rows, r.pageData.rows,
orderPayItemPredict orderPayItemPredict
); );
if (!withActions) {
items = items.filter( items = items.filter(
(i) => (i) =>
i.status !== PayStatus.Deleted && i.status !== PayStatus.Deleted &&
i.status !== PayStatus.Cancel i.status !== PayStatus.Cancel
); );
}
if (withActions) { if (withActions) {
for (let i = 0; i < r.pageData.rows.length; i++) { for (let i = 0; i < r.pageData.rows.length; i++) {
r.pageData && r.pageData &&
r.pageData.rows && r.pageData.rows &&
r.pageData.rows[i] && r.pageData.rows[i] &&
items[i] &&
(items[i].actions = r.pageData.rows[i].actions); (items[i].actions = r.pageData.rows[i].actions);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment