gsb

xgg-saas-merchant/app/base/controller/impl/saas/invoiceCtl.js

@@ -56,7 +56,7 @@ class InvoiceCtl extends CtlBase {
   }
   }
 
 
   //发票列表
   //发票列表
-  async saasinvoicePage(params, pobj2, req) {
+  async invoicePage(params, pobj2, req) {
   try {
   try {
       let rs = await this.invoiceSve.saasinvoicePage(params);
       let rs = await this.invoiceSve.saasinvoicePage(params);
       return rs;
       return rs;

xgg-saas-merchant/app/base/controller/impl/saas/merchantCtl.js

@@ -67,6 +67,20 @@ class MerchantCtl extends CtlBase {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
     }
   }
   }
+  async title(params, pobj2, req) {
+    try {
+      return await this.merchantSve.title(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+  async addr(params, pobj2, req) {
+    try {
+      return await this.merchantSve.addr(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
 
 
 
 
 }
 }

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

@@ -91,7 +91,7 @@ class MerchantService extends ServiceBase {
   }
   }
 
 
 
 
-  async merchantTitle(params) {
+  async title(params) {
     let rs = await this.callms("merchant", "mchtTitles", params);
     let rs = await this.callms("merchant", "mchtTitles", params);
     let list = rs.data || [];
     let list = rs.data || [];
     let u = {};
     let u = {};
@@ -101,7 +101,7 @@ class MerchantService extends ServiceBase {
     return system.getResultSuccess(u);
     return system.getResultSuccess(u);
   }
   }
 
 
-  async merchantAddr(params) {
+  async addr(params) {
     let rs = await this.callms("merchant", "mchtAddrs", params);
     let rs = await this.callms("merchant", "mchtAddrs", params);
     let list = rs.data || [];
     let list = rs.data || [];
     let u = {};
     let u = {};

xgg-saas-merchant/app/base/system.js

@@ -178,7 +178,7 @@ class System {
 				common: dev + ":3102" + path,
 				common: dev + ":3102" + path,
 
 
 				// 商户服务
 				// 商户服务
-				merchant: dev + ":3101" + path,
+				merchant: local + ":3101" + path,
 
 
 				// 订单服务
 				// 订单服务
 				order: local + ":3103" + path,
 				order: local + ":3103" + path,

xgg-saas-merchant/app/front/entry/public/apidoc/saas/invoice.md

@@ -2,6 +2,8 @@
 1. [发票申请-功能1-交易列表](#merchantPage)
 1. [发票申请-功能1-交易列表](#merchantPage)
 1. [发票申请-功能2-交易列表](#platformPage)
 1. [发票申请-功能2-交易列表](#platformPage)
 1. [发票申请-功能3-订单列表](#orderPage)
 1. [发票申请-功能3-订单列表](#orderPage)
+1. [商户抬头](#merchantTitle)
+1. [商户地址](#merchantAddr)
 1. [发票申请](#apply)
 1. [发票申请](#apply)
 
 
 ## **<a name="orderPage"> 发票申请-功能1-交易列表</a>**
 ## **<a name="orderPage"> 发票申请-功能1-交易列表</a>**
@@ -182,6 +184,17 @@
 }
 }
 ```
 ```
 
 
+## **<a name="merchantTitle"> 商户抬头</a>**
+[返回到目录](#menu)
+##### URL
+[/web/saas/merchantCtl/title]  <a href="/doc/saas/merchant.md#title">【 去接口详情 】</a>
+
+## **<a name="merchantAddr"> 商户地址</a>**
+[返回到目录](#menu)
+##### URL
+[/web/saas/merchantCtl/addr]  <a href="/doc/saas/merchant.md#title">【 去接口详情 】</a>
+
+
 
 
 ## **<a name="apply"> 发票申请</a>**
 ## **<a name="apply"> 发票申请</a>**
 [返回到目录](#menu)
 [返回到目录](#menu)

xgg-saas-merchant/app/front/entry/public/apidoc/saas/merchant.md

@@ -8,6 +8,8 @@
 1. [商户账号列表](#userPage)
 1. [商户账号列表](#userPage)
 1. [账号信息](#userInfo)
 1. [账号信息](#userInfo)
 1. [账号编辑](#save)
 1. [账号编辑](#save)
+1. [商户抬头](#title)
+1. [商户地址](#addr)
 
 
 
 
 ## **<a name="dics"> 字典</a>**
 ## **<a name="dics"> 字典</a>**
@@ -466,4 +468,60 @@
         "requestid": "a4c7b5ce853d45cda37fbd93c7360353"
         "requestid": "a4c7b5ce853d45cda37fbd93c7360353"
     }
     }
 
 
+```
+
+
+## **<a name="title"> 商户抬头</a>**
+[返回到目录](#menu)
+##### URL
+[/web/saas/merchantCtl/title]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+
+``` javascript
+    {}
+```
+
+#### 返回结果
+```javascript
+    {
+        "status": 0,
+        "msg": "success",
+        "data": {
+            "merchant_name": "舟山兰和有限公司",        // 商户名称
+            "merchant_credit_code": "KHSDLKFJAFJ",     // 信用代码
+            "merchant_tax_type": "00",                 // 纳税人类型 00一般纳税人 10小规模纳税人
+            "merchant_addr": "河南信阳",                // 商户地址
+            "merchant_mobile": "18833836395",          // 商户电话
+            "merchant_bank": "北京银行栓秀支行",        // 商户开户行
+            "merchant_account": "zhousanlanhe",        // 商户银行账号
+            "created_at": "2020-04-08 01:44:51",       // 创建时间
+        }
+    }
+
+```
+
+## **<a name="addr"> 商户地址</a>**
+[返回到目录](#menu)
+##### URL
+[/web/saas/merchantCtl/addr]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+
+``` javascript
+    {}
+```
+
+#### 返回结果
+```javascript
+    {
+        "status": 0,
+        "msg": "success",
+        "data": {
+            "mail_addr": "北京朝阳区国创元",                // 邮寄地址
+            "mail_mobile": "010-4525821-44",               // 联系电话
+            "mail_to": "张娇哒哒哒",                       // 收件人
+        }
+    }
+
 ```
 ```
\ No newline at end of file