Skip to content

Z
zhichan
Commit c1b7bda7 by 孙亚楠
Options

Merge branch 'xgg-admin-dev' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-admin-dev

parents 8e2d6b6f 2a92bd1a
Showing with 121 additions and 3 deletions
xgg-admin/app/base/controller/ctlms.base.js
...@@ -6,6 +6,7 @@ class CtlBase { ...@@ -6,6 +6,7 @@ class CtlBase {
} }
async doexec(methodname, pobj, query, req) { async doexec(methodname, pobj, query, req) {
try { try {
console.log(methodname, "-------ctl methodname-------");
var rtn = await this[methodname](pobj, query, req); var rtn = await this[methodname](pobj, query, req);
return rtn; return rtn;
} catch (e) { } catch (e) {
......
xgg-admin/app/base/controller/impl/business/businessmenCtl.js
...@@ -58,6 +58,30 @@ class BusinessmenCtl extends CtlBase { ...@@ -58,6 +58,30 @@ class BusinessmenCtl extends CtlBase {
} }
} }
async signPage(pobj, pobj2, req) {
try {
let condition = {
currentPage: pobj.currentPage,
pageSize: pobj.pageSize,
order_id: this.trim(pobj.order_id),
name: this.trim(pobj.name),
bd_id: this.trim(pobj.bd_id),
bd_path: this.trim(pobj.bd_path),
legal_name: this.trim(pobj.legal_name),
legal_mobile: this.trim(pobj.legal_mobile),
legal_idcard: this.trim(pobj.legal_idcard),
credit_code: this.trim(pobj.credit_code),
isSign: true,
}
return await this.businessmenSve.allPage(condition);
} catch (error) {
console.log(error);
return system.getResultFail(500, "接口异常：" + error.message);
}
}
/** /**
* 个体户签约 * 个体户签约
......
xgg-admin/app/base/service/impl/business/businessmenSve.js
...@@ -54,7 +54,7 @@ class BusinessmenService extends ServiceBase { ...@@ -54,7 +54,7 @@ class BusinessmenService extends ServiceBase {
row.serviceRate = system.f2y(row.serviceRate); row.serviceRate = system.f2y(row.serviceRate);
row.serviceBeginTime = system.f2y(row.serviceRate); row.serviceBeginTime = system.f2y(row.serviceRate);
row.serviceRate = system.f2y(row.serviceRate); row.serviceRate = system.f2y(row.serviceRate);
this.handleDate(row, ["service_begin_time", "service_end_time", "tax_reg_day", "reg_date"], "YYYY-MM-DD", -8); this.handleDate(row, ["service_begin_time", "service_end_time", "tax_reg_day", "reg_date", "sign_time"], "YYYY-MM-DD", -8);
this.parseJsonField(row, ["common_tax_ladder", "common_other_ladder", "special_tax_ladder", "special_other_ladder"]); this.parseJsonField(row, ["common_tax_ladder", "common_other_ladder", "special_tax_ladder", "special_other_ladder"]);
} }
} }
......
xgg-admin/app/base/system.js
...@@ -181,8 +181,8 @@ class System { ...@@ -181,8 +181,8 @@ class System {
// merchant: "http://127.0.0.1:3101" + path, // merchant: "http://127.0.0.1:3101" + path,
// 订单服务 // 订单服务
// order: domain + ":3103" + path, order: domain + ":3103" + path,
order: "http://127.0.0.1:3103" + path, // order: "http://127.0.0.1:3103" + path,
// 发票服务 // 发票服务
invoice: domain + ":3105" + path, invoice: domain + ":3105" + path,
......
xgg-admin/app/config/routes/web.js
...@@ -18,6 +18,7 @@ module.exports = function (app) { ...@@ -18,6 +18,7 @@ module.exports = function (app) {
} }
} }
console.log(req.url, "----------- request url ");
if (req.url.indexOf("auth/userCtl/login") > 0 || if (req.url.indexOf("auth/userCtl/login") > 0 ||
req.url.indexOf("uc/userCtl/login") > 0 || req.url.indexOf("uc/userCtl/login") > 0 ||
req.url.indexOf("auth/userCtl/smsCode") > 0 || req.url.indexOf("auth/userCtl/smsCode") > 0 ||
......
xgg-admin/app/front/entry/public/apidoc/business/businessmen.md
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
1. [我的个体户](#myPage) 1. [我的个体户](#myPage)
1. [个体户签约](#signing) 1. [个体户签约](#signing)
1. [个体户建帐](#createAccount) 1. [个体户建帐](#createAccount)
1. [签约管理](#signPage)
## **<a name="allPage"> 个体户信息 </a>** ## **<a name="allPage"> 个体户信息 </a>**
...@@ -240,3 +242,92 @@ ...@@ -240,3 +242,92 @@
} }
``` ```
## **<a name="signPage"> 签约管理 </a>**
[返回到目录](#menu)
##### URL
[/web/business/businessmenCtl/signPage]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"currentPage": "1",
"pageSize": "10",
"order_id": "", // 订单号
// 以下查询条件留着以后备用
"name": "", // 个体户名称
"legal_name": "", // 法人姓名
"legal_mobile": "", // 法人手机号
"legal_idcard": "", // 法人身份证号
"credit_code": "", // 统一社会信用代码
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {
"count": 3,
"rows": [
{
"id":"", // 主键,
"order_id":"", // 订单id,
"legal_name":"", // 法人姓名,
"legal_mobile":"", // 法人电话,
"legal_idcard":"", // 法人身份证号,
"name":"", // 个体工商户名称,
"credit_code":"", // 统一社会信用代码,
"business_place":"", // 经营场所,
"business_scope":"", // 经营范围,
"reg_date":"", // 注册日期,
"business_img":"", // 执照照片,
"business_gov_file":"", // 工商官方文件,
"gongzhang":"", // 公章,
"caiwuzhang":"", // 财务章,
"fapiaozhang":"", // 发票章,
"hetongzhang":"", // 合同章,
"farenzhang":"", // 法人章,
"zhang_gov_file":"", // 刻章官方文件,
"is_bank":"", // 是否开户,
"bank_name":"", // 账户名称,
"bank_no":"", // 账户号,
"bank":"", // 开户行,
"bank_img":"", // 账户信息,
"bank_gov_file":"", // 银行开户官方文件,
"ca_img":"", // CA照片,
"tax_reg_day":"", // 税务登记日,
"tax_org":"", // 税务机构名称,
"tax_gov_file":"", // 税务报道官方文件,
"notes":"", // 备注,
"common_tax_ladder":"", // 普票个税阶梯,
"common_other_ladder":"", // 普票增值税、附加税阶梯,
"special_tax_ladder":"", // 专票个税阶梯,
"special_other_ladder":"", // 专票增值税、附加税阶梯,
"service_begin_time":"", // 服务开始时间,
"service_end_time":"", // 服务结束时间,
"cost_rate":"", // 核定成本费用率,
"tax_rate":"", // 含税价百分比,
"add_value_up_type":"", // 增值税累计类型 1按月 2按季度,
"tax_up_type":"", // 个税累计类型 1按月累计 2按年累计,
"service_rate":"", // 服务费比例,
"sign_notes":"", // 签约备注,
"sign_time":"", // 签约时间,
"is_create_account":"", // 是否建账,
}
]
},
"requestid": "7443807c76b940a2bde2abd0311e2fd8"
}
```
\ No newline at end of file
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