Skip to content

Z
zhichan
Commit 6b467746 by 孙亚楠
Options

dd

parent 37a50a17
Showing with 271 additions and 7 deletions
xgg-saas-merchant/app/base/service/impl/saas/businessmenSve.js
...@@ -19,7 +19,22 @@ class BusinessmenSveService extends ServiceBase { ...@@ -19,7 +19,22 @@ class BusinessmenSveService extends ServiceBase {
console.log(e); console.log(e);
return system.getResult(null,`系统错误`); return system.getResult(null,`系统错误`);
} }
} }
/**
* 获取所有符合条件的个体户信息
* @param params
* @returns {Promise<void>}
*/
async assorderBusinessmenInfo(params){
try{
var rs = await this.callms("order", "assorderBusinessmenInfo", params || {});
return rs;
}catch (e) {
console.log(e);
return system.getResult(null,`系统错误`);
}
};
} }
module.exports = BusinessmenSveService; module.exports = BusinessmenSveService;
xgg-saas-merchant/app/base/service/impl/trade/tradeSve.js
...@@ -371,6 +371,23 @@ class TradeService extends ServiceBase { ...@@ -371,6 +371,23 @@ class TradeService extends ServiceBase {
let rs = await this.callms("trade", "invoiceTrade", params) || {}; let rs = await this.callms("trade", "invoiceTrade", params) || {};
return rs; return rs;
} }
/**
* 根据统一社会信用代码获取账单流水
* @returns {Promise<void>}
* @param credit_code_array Array
*/
async tradeItemBycreditCode(params) {
try{
if(!(params.credit_code_array instanceof Array) && params.credit_code_array.length <0){
return system.getResult(null, `参数格式错误`);
}
return await this.callms("trade", "tradeItemBycreditCode", params) || {};
}catch (e) {
console.log(e);
return system.getResult(null, `系统错误`);
}
}
} }
module.exports = TradeService; module.exports = TradeService;
\ No newline at end of file
xgg-saas-merchant/app/base/system.js
...@@ -194,7 +194,7 @@ class System { ...@@ -194,7 +194,7 @@ class System {
merchant: dev + ":3101" + path, merchant: dev + ":3101" + path,
// 订单服务 // 订单服务
order: dev + ":3103" + path, order: local + ":3103" + path,
// 发票服务 // 发票服务
invoice: dev + ":3105" + path, invoice: dev + ":3105" + path,
...@@ -203,7 +203,7 @@ class System { ...@@ -203,7 +203,7 @@ class System {
uc: dev + ":3106" + path, uc: dev + ":3106" + path,
// 交易 // 交易
trade: dev + ":3107" + path, trade: local + ":3107" + path,
} }
} else { } else {
return { return {
......
xgg-saas-merchant/app/base/wxapplet/impl/merchantApplet.js
...@@ -14,6 +14,8 @@ class MerchantApplet extends AppletBase { ...@@ -14,6 +14,8 @@ class MerchantApplet extends AppletBase {
this.merchantappletuserSve = system.getObject("service.uc.merchantappletuserSve"); this.merchantappletuserSve = system.getObject("service.uc.merchantappletuserSve");
this.orderSve = system.getObject("service.saas.orderSve"); this.orderSve = system.getObject("service.saas.orderSve");
this.merchantId = 1; this.merchantId = 1;
this.businessmenSve = system.getObject("service.saas.businessmenSve");
this.tradeSve = system.getObject("service.trade.tradeSve");
} }
async test(o, obj, req) { async test(o, obj, req) {
...@@ -255,7 +257,55 @@ class MerchantApplet extends AppletBase { ...@@ -255,7 +257,55 @@ class MerchantApplet extends AppletBase {
return {code: 500, msg: "服务忙，请稍后重试"}; return {code: 500, msg: "服务忙，请稍后重试"};
} }
} }
//
/**
* 个体户列表/个体户列表
* @param params
* @param pobj2
* @param req
* @returns {Promise<void>}
*/
async saasorderbusinessmenPage (params, pobj2, req){
let loginUser = await this.getLoginUser(pobj2.merchant_id, pobj2.openid);
pobj2.merchant_app_user_id = loginUser.id;
return await this.businessmenSve.saasorderbusinessmenPage(pobj2);
}
/**
* 获取用户下的所有交易记录
* @param pobj1
* @param pobj2
* @param req
* @returns {Promise<{msg: string, data: (*|null), bizmsg: string, status: number}>}
*/
async saasTradeBusinessmenPage(pobj1, pobj2, req){
let loginUser = await this.getLoginUser(pobj2.merchant_id, pobj2.openid);
pobj2.merchant_app_user_id = loginUser.id;
pobj2.attrs=["credit_code"];
if(!pobj2.merchant_app_user_id){
return system.getResult(null, `登录失效，请重新登录`);
}
try{
let creditCodeArray =await this.businessmenSve.assorderBusinessmenInfo(pobj2);
if(creditCodeArray.status != 0){
return creditCodeArray;
}
let creditCodes = [];
for (let val of creditCodeArray.data) {
creditCodes.push(val.credit_code);
}
if(!creditCodes || creditCodes.length ==0){
return sys.getResult([]);
}
pobj2.credit_code_array = creditCodes;
return await this.tradeSve.tradeItemBycreditCode(pobj2);
}catch (e) {
console.log(e);
return system.getResult(null, `系统错误`);
}
}
} }
module.exports = MerchantApplet; module.exports = MerchantApplet;
\ No newline at end of file
xgg-saas-merchant/app/front/entry/public/apidoc/applet/order.md
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
1. [保存订单](#saveOrder) 1. [保存订单](#saveOrder)
1. [我的订单](#myOrders) 1. [我的订单](#myOrders)
1. [订单详情](#orderInfo) 1. [订单详情](#orderInfo)
1. [个体户管理/个体户详情](#saasorderbusinessmenPage)
1. [转账交易](#saasorderbusinessmenPage)
## **<a name="idNoValid"> 身份证校验</a>** ## **<a name="idNoValid"> 身份证校验</a>**
[返回到目录](#menu) [返回到目录](#menu)
##### URL ##### URL
...@@ -184,4 +185,184 @@ ...@@ -184,4 +185,184 @@
}, },
"requestid": "00521a0a0f094c8d982bf4375fbe91b1" "requestid": "00521a0a0f094c8d982bf4375fbe91b1"
} }
``` ```
\ No newline at end of file
## **<a name="saasorderbusinessmenPage"> 个体户管理</a>**
[返回到目录](#menu)
##### URL
[/applet/merchantApplet/saasorderbusinessmenPage]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id":"dddd"
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "操作成功",
"data": {
"count": 1,
"rows": [
{
"id": "1727155000004670",
"saas_id": "10000",
"merchant_id": "11248111258000991",
"product_id": 10010000,
"saas_order_id": "",
"company_id": "116",
"customer_id": "498786",
"legal_name": "郝哈哈1",
"legal_mobile": "18833836395",
"legal_idcard": "150403199612172012",
"name": "name1",
"credit_code": "92321311MA205QEJ3M",
"business_place": "好的好的和",
"business_scope": "对对对急急急",
"reg_date": "2020-03-21 00:00:00",
"business_img": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1584759285001.jpg",
"business_gov_file": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1584759291483.jpg",
"gongzhang": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1584759307283.jpg",
"caiwuzhang": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1584759310909.jpg",
"fapiaozhang": "",
"hetongzhang": "",
"farenzhang": "",
"zhang_gov_file": "",
"is_bank": 0,
"bank_name": "张哈哈哈",
"bank_no": "1377373",
"bank": "的好的很好的哈",
"bank_img": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1584759330846.jpg",
"bank_gov_file": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1584759336371.jpg",
"ca_img": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1584759349850.jpg",
"tax_reg_day": "2020-03-21T00:00:00.000Z",
"tax_org": "的好的好的和",
"tax_gov_file": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_wxapplet_1584759354261.jpg",
"notes": "",
"common_tax_ladder": [
{
"minValue": "1",
"maxValue": "",
"quiCalDed": "1",
"rate": "1"
}
],
"common_other_ladder": [
{
"minValue": "1",
"zengzhiRate": "1",
"fujiaRate": "1",
"maxValue": ""
}
],
"special_tax_ladder": [
{
"minValue": "1",
"maxValue": "",
"quiCalDed": "1",
"rate": "1"
}
],
"special_other_ladder": [
{
"minValue": "1",
"zengzhiRate": "1",
"fujiaRate": "1",
"maxValue": ""
}
],
"service_begin_time": null,
"service_end_time": null,
"cost_rate": 0,
"tax_rate": 0,
"add_value_up_type": "1",
"tax_up_type": "1",
"service_rate": 0,
"sign_notes": "",
"sign_time": null,
"is_create_account": 0,
"bd_id": 2,
"bd_path": "",
"province": "",
"create_account_time": null,
"invoice_content": null,
"created_at": "2020-04-11 08:44:42",
"updated_at": "2020-04-11T08:57:17.000Z",
"deleted_at": null,
"version": 2,
"merchant_app_user_id": "38",
"is_bank_name": "未开户"
}
]
},
"bizmsg": "empty",
"requestid": "5a9c5444eb4c49258d1594ffab8c28f9"
}
```
## **<a name="saasTradeBusinessmenPage"> 个体户账单</a>**
[返回到目录](#menu)
##### URL
[/applet/merchantApplet/saasTradeBusinessmenPage]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"merchant_id":"11249768207001229",
"openid":"od1Y85NtLgV1tFdKsPUXV8LhMMzI"
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "操作成功",
"data": [
{
"id": 1001597,
"trade_no": "T10015974616001",
"saas_merchant_id": "11249768207001229",
"order_id": "1295094343007461",
"order_type": "10",
"out_trade_no": "13699290914238848",
"acc_name": "焦阳",
"credit_code": "SYNSSD123123123123",
"acc_no": "6214830103140970",
"open_bank": "招商银行",
"amt": 90000,
"actual_amt": 90000,
"deduct_amt": 92700,
"service_tax": 2700,
"trade_status": "00",
"trade_time": "2020-05-11 20:00:00",
"trade_desc": "1",
"trade_receipt": "",
"remark": "无",
"saas_id": "10000",
"saas_invoice_id": "",
"created_at": "2020-05-11 14:01:16",
"updated_at": "2020-05-11T06:01:16.000Z",
"deleted_at": null,
"version": 0,
"order_type_name": "平台交易",
"trade_status_name": "成功"
},
]
}
```
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