Skip to content

Z
zhichan
Commit 8d939bf6 by 王昆
Options

Merge branch 'xgg-saas-merchant' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-saas-merchant

parents 3e1c2379 9c3fa224
Showing with 261 additions and 4 deletions
xgg-saas-merchant/app/base/controller/impl/saas/businessmenCtl.js 0 → 100644
var system = require("../../../system")
const CtlBase = require("../../ctlms.base");
class BusinessmenCtl extends CtlBase {
constructor() {
super();
this.businessmenSve = system.getObject("service.saas.businessmenSve");
}
/**
* 个体户列表
* @param params
* @param pobj2
* @param req
* @returns {Promise<void>}
*/
async saasorderbusinessmenPage (params, pobj2, req){
if(!params.saas_merchant_id){
return system.getResult(null,`请重新登陆`)
}
params.merchant_id = params.saas_merchant_id;
return await this.businessmenSve.saasorderbusinessmenPage(params);
}
}
module.exports = BusinessmenCtl;
xgg-saas-merchant/app/base/controller/impl/saas/merchantCtl.js
......@@ -101,6 +101,5 @@ class MerchantCtl extends CtlBase {
}
}
}
module.exports = MerchantCtl;
xgg-saas-merchant/app/base/service/impl/saas/businessmenSve.js 0 → 100644
const system = require("../../../system");
const ServiceBase = require("../../svems.base")
const settings = require("../../../../config/settings")
class BusinessmenSveService extends ServiceBase {
constructor() {
super();
this.SETTINGS_KEY = "merchant_settings_";
this.INFO_KEY = "merchant_info_";
this.channelSve = system.getObject("service.saas.channelSve");
this.mainSve = system.getObject("service.saas.mainSve");
this.redisClient = system.getObject("util.redisClient");
}
async saasorderbusinessmenPage(params){
try{
var rs = await this.callms("order", "saasorderbusinessmenPage", params || {});
return rs;
}catch (e) {
console.log(e);
return system.getResult(null,`系统错误`);
}
}
}
module.exports = BusinessmenSveService;
xgg-saas-merchant/app/base/service/impl/saas/merchantSve.js
......@@ -194,6 +194,5 @@ class MerchantService extends ServiceBase {
row.merchant = map[row.saas_merchant_id] || {};
}
}
}
module.exports = MerchantService;
xgg-saas-merchant/app/base/system.js
......@@ -187,7 +187,7 @@ class System {
merchant: dev + ":3101" + path,
// 订单服务
order: dev + ":3103" + path,
order: local + ":3103" + path,
// 发票服务
invoice: dev + ":3105" + path,
......
xgg-saas-merchant/app/front/entry/public/apidoc/README.md
......@@ -28,6 +28,9 @@
## 报表管理
　　1 [账期](/doc/tax/tax.md)
## 用户管理
　　1 [个体户列表](/doc/saas/businessmen.md)
## 小程序接口
　　1 [登录](/doc/applet/login.md)
......
xgg-saas-merchant/app/front/entry/public/apidoc/saas/businessmen.md 0 → 100644
<a name="menu">目录</a>
1. [个体户列表](#saasorderbusinessmenPage)
## **<a name="saasorderbusinessmenPage"> 个体户列表</a>**
[返回到目录](#menu)
##### URL
[/web/saas/businessmenCtl/saasorderbusinessmenPage]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"credit_code":"xxxx" //统一社会信用代码
"name":"xxx", //商户名称
"legal_idcard":"xxx", //法人身份证好
"currentPage":"1",
"pageSize":10
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "操作成功",
"count":1,
"data": [
{
"id": "1728803996004807",
"saas_id": "10000",
"merchant_id": "11249768207001229",
"product_id": 10010000,
"saas_order_id": "",
"company_id": "",
"customer_id": "",
"legal_name": "法2", //法人名称
"legal_mobile": "13720884302",
"legal_idcard": "350181198512211961",
"name": "真言2", //个体户名称
"credit_code": "ZJFMC1231231231232", //社会统一社会信用代码
"business_place": "狗熊岭",
"business_scope": "\"砍树\"",
"reg_date": "2020-04-14 00:00:00", //注册日期
"business_img": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1586919563597.jpg",
"business_gov_file": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1586919572421.jpg",
"gongzhang": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1586919609522.jpg",
"caiwuzhang": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1586919615026.jpg",
"fapiaozhang": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1586919620220.jpg",
"hetongzhang": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1586919625504.jpg",
"farenzhang": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1586919630469.jpg",
"zhang_gov_file": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1586919641176.jpg",
"is_bank": 1,
"bank_name": "ZJBANDACCOUNT",
"bank_no": "ZJBANDACCOUNT123",
"bank": "工商银行",
"bank_img": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1586919718121.jpg",
"bank_gov_file": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1586919725990.jpg",
"ca_img": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1586919763911.jpg",
"tax_reg_day": "2020-04-14T00:00:00.000Z",
"tax_org": "狗熊岭税务局",
"tax_gov_file": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1586919769613.jpg",
"notes": "",
"common_tax_ladder": [
{
"minValue": "0",
"maxValue": "3000000",
"quiCalDed": "0",
"rate": "5"
},
{
"minValue": "3000100",
"maxValue": "9000000",
"rate": "10",
"quiCalDed": "150000"
},
{
"minValue": "9000100",
"maxValue": "30000000",
"rate": "20",
"quiCalDed": "1050000"
},
{
"minValue": "30000100",
"maxValue": "50000000",
"rate": "30",
"quiCalDed": "4050000"
},
{
"minValue": "50000100",
"maxValue": "60000000",
"rate": "35",
"quiCalDed": "6550000"
}
],
"common_other_ladder": [
{
"minValue": "0",
"zengzhiRate": "0",
"fujiaRate": "0",
"maxValue": "10000000"
},
{
"minValue": "10000000",
"maxValue": "500000000",
"rate": "",
"fujiaRate": "12",
"zengzhiRate": "3"
}
],
"special_tax_ladder": [
{
"minValue": "0",
"maxValue": "3000000",
"quiCalDed": "0",
"rate": "5"
},
{
"minValue": "3000100",
"maxValue": "9000000",
"rate": "10",
"quiCalDed": "150000"
},
{
"minValue": "9000100",
"maxValue": "30000000",
"rate": "20",
"quiCalDed": "1050000"
},
{
"minValue": "30000100",
"maxValue": "50000000",
"rate": "30",
"quiCalDed": "4050000"
},
{
"minValue": "50000100",
"maxValue": "60000000",
"rate": "35",
"quiCalDed": "6550000"
}
],
"special_other_ladder": [
{
"minValue": "0",
"zengzhiRate": "3",
"fujiaRate": "12",
"maxValue": "500000000"
}
],
"service_begin_time": null,
"service_end_time": null,
"cost_rate": 96,
"tax_rate": 0,
"add_value_up_type": "2",
"tax_up_type": "1",
"service_rate": 0,
"sign_notes": "",
"sign_time": null,
"is_create_account": 0,
"bd_id": 42,
"bd_path": "/公司宝/bpo/大客户/42/",
"province": "",
"create_account_time": null,
"invoice_content": null,
"created_at": "2020-04-15 03:25:13",
"updated_at": "2020-04-15T03:25:13.000Z",
"deleted_at": null,
"version": 0,
"is_bank_name": "已开户" //银行开户状态
}
],
"bizmsg": "empty",
"requestid": "22b78ad07c77494d96e0ce23d7df28f9"
}
```
xgg-saas-merchant/app/front/entry/public/apidoc/saas/merchant.md
......@@ -2,7 +2,7 @@
1. [商户抬头](#title)
1. [邮寄地址](#addr)
1. [邮寄地址编辑](#saveAddr)
1. [个体户列表](#saasorderbusinessmenPage)
## **<a name="title"> 商户抬头</a>**
[返回到目录](#menu)
##### URL
......@@ -90,3 +90,34 @@
}
```
## **<a name="saasorderbusinessmenPage"> 个体户列表</a>**
[返回到目录](#menu)
##### URL
[/web/saas/businessmenCtl/saasorderbusinessmenPage]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": "111" // id
"mail_addr": "北京朝阳区国创元", // 邮寄地址
"mail_mobile": "010-4525821-44", // 联系电话
"mail_to": "张娇哒哒哒", // 收件人
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {
"id": "111" // id
"mail_addr": "北京朝阳区国创元", // 邮寄地址
"mail_mobile": "010-4525821-44", // 联系电话
"mail_to": "张娇哒哒哒", // 收件人
}
}
```
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