Commit ebfa5eae by 王昆

gsb

parent f8f9a27b
...@@ -96,6 +96,9 @@ class MerchantService extends ServiceBase { ...@@ -96,6 +96,9 @@ class MerchantService extends ServiceBase {
if (row.main_id_trade) { if (row.main_id_trade) {
mainIds.push(row.main_id_trade); mainIds.push(row.main_id_trade);
} }
if (row.main_id_invoice) {
mainIds.push(row.main_id_invoice);
}
} }
if (mainIds.length == 0) { if (mainIds.length == 0) {
return; return;
...@@ -107,6 +110,7 @@ class MerchantService extends ServiceBase { ...@@ -107,6 +110,7 @@ class MerchantService extends ServiceBase {
for (let row of rows) { for (let row of rows) {
row.main = map[row.main_id] || {}; row.main = map[row.main_id] || {};
row.main_trade = map[row.main_id_trade] || {}; row.main_trade = map[row.main_id_trade] || {};
row.main_invoice = map[row.main_id_invoice] || {};
} }
} }
......
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 to comment