Skip to content

Z
zhichan
Commit ab5d136a by 王昆
Options

gsb

parent 4b391ecc
Showing with 9 additions and 0 deletions
xgg-saas-platform/app/base/service/impl/saas/merchantSve.js
...@@ -93,6 +93,9 @@ class MerchantService extends ServiceBase { ...@@ -93,6 +93,9 @@ class MerchantService extends ServiceBase {
if (row.main_id) { if (row.main_id) {
mainIds.push(row.main_id); mainIds.push(row.main_id);
} }
if (row.main_id_trade) {
mainIds.push(row.main_id_trade);
}
} }
if (mainIds.length == 0) { if (mainIds.length == 0) {
return; return;
...@@ -103,6 +106,7 @@ class MerchantService extends ServiceBase { ...@@ -103,6 +106,7 @@ class MerchantService extends ServiceBase {
map = map.data || {}; map = map.data || {};
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] || {};
} }
} }
......
xgg-saas-platform/app/front/entry/public/apidoc/saas/merchant.md
...@@ -287,6 +287,7 @@ ...@@ -287,6 +287,7 @@
"contact_email" : "", // 联系邮箱 "contact_email" : "", // 联系邮箱
"main_id": 50000, // 签约主体id "main_id": 50000, // 签约主体id
"main_id_trade": 50000, // 转账签约主体id new
"begin_date": "2020-03-19", // 签约开始时间 "begin_date": "2020-03-19", // 签约开始时间
"end_date": "2025-03-19", // 签约结束时间 "end_date": "2025-03-19", // 签约结束时间
"bm_reg_price": 5.11, // 个体户注册单价 "bm_reg_price": 5.11, // 个体户注册单价
...@@ -304,6 +305,10 @@ ...@@ -304,6 +305,10 @@
"main": { "main": {
"name": "name2", // 签约主体名称 "name": "name2", // 签约主体名称
} }
// 转账签约主体对象
"main_trade": {
"name": "name2", // 签约主体名称 new
}
}, },
] ]
}, },
......
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