d

xggsve-merchant/app/base/service/impl/merchant/saasmerchantSve.js

@@ -6,6 +6,7 @@ class SaasMerchantService extends ServiceBase {
     super("merchant", ServiceBase.getDaoName(SaasMerchantService));
 
     this.saasmerchantsignDao = system.getObject("db.merchant.saasmerchantsignDao");
+    this.saasmainDao = system.getObject("db.main.saasmainDao");
     this.saasmerchantsettingsDao = system.getObject("db.merchant.saasmerchantsettingsDao");
     this.saasmerchanttitleDao = system.getObject("db.merchant.saasmerchanttitleDao");
     this.saasmerchantaddrDao = system.getObject("db.merchant.saasmerchantaddrDao");
@@ -53,6 +54,14 @@ class SaasMerchantService extends ServiceBase {
     let sign = await this.saasmerchantsignDao.getById(params.id);
     this.handleDate(sign, ["created_at"], null, -8);
     this.handleDate(sign, ["begin_date", "end_date"], "YYYY-MM-DD");
+    /**
+     * TODO:这里只查询个体户注册签约的主题，如果以后添加发票等签约主体，需要新增查询
+     */
+    let saas_main =null;
+    if(sign.main_id) {
+      saas_main = await this.saasmainDao.getById(sign.main_id);
+    }
+    sign.saas_main = saas_main || {};
     merchant.sign = sign;
     return system.getResultSuccess(merchant);
   }