gsb

xgg-saas-platform/app/base/service/impl/saas/merchantSve.js

@@ -93,6 +93,9 @@ class MerchantService extends ServiceBase {
       if (row.main_id) {
         mainIds.push(row.main_id);
       }
+      if (row.main_id_trade) {
+        mainIds.push(row.main_id_trade);
+      }
     }
     if (mainIds.length == 0) {
       return;
@@ -103,6 +106,7 @@ class MerchantService extends ServiceBase {
     map = map.data || {};
     for (let row of rows) {
       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 @@
                     "contact_email" : "",           // 联系邮箱
 
                     "main_id": 50000,               // 签约主体id
+                    "main_id_trade": 50000,         // 转账签约主体id   new
                     "begin_date": "2020-03-19",     // 签约开始时间
                     "end_date": "2025-03-19",       // 签约结束时间
                     "bm_reg_price": 5.11,           // 个体户注册单价
@@ -304,6 +305,10 @@
                     "main": {
                         "name": "name2",            // 签约主体名称
                     }
+                    // 转账签约主体对象
+                    "main_trade": {
+                        "name": "name2",            // 签约主体名称    new
+                    }
                 },
             ]
         },