gsb

esign-admin/app/base/controller/impl/merchant/merchantCtl.js

@@ -46,6 +46,7 @@ class MerchantUserCtl extends CtlBase {
 
     async auditMerchant(params, pobj2, req) {
         try {
+            params.audit_user_id = req.loginUser.id;
             return await this.merchantSve.auditMerchant(params);
         } catch (error) {
             return system.getResult(null, `系统错误 错误信息 ${error}`);

esign-admin/app/base/controller/impl/merchant/merchantaccountCtl.js

+var system = require("../../../system")
+const settings = require("../../../../config/settings")
+const CtlBase = require("../../ctlms.base");
+const md5 = require("MD5");
+const uuidv4 = require('uuid/v4');
+const logCtl = system.getObject("web.common.oplogCtl");
+
+class MerchantaccountCtl extends CtlBase {
+    constructor() {
+        super();
+        this.merchantaccountSve = system.getObject("service.merchant.merchantaccountSve");
+    }
+
+    async reduceAccountBalance(params, pobj2, req) {
+        try {
+            return await this.merchantSve.reduceAccountBalance(params);
+        } catch (error) {
+            return system.getResult(null, `系统错误 错误信息 ${error}`);
+        }
+    }
+
+    async addordelavailable(params, pobj2, req) {
+        try {
+            return await this.merchantSve.addordelavailable(params);
+        } catch (error) {
+            return system.getResult(null, `系统错误 错误信息 ${error}`);
+        }
+    }
+
+
+}
+
+module.exports = MerchantaccountCtl;

esign-admin/app/base/controller/impl/merchant/merchanttradeCtl.js

@@ -32,6 +32,7 @@ class MerchantUserCtl extends CtlBase {
     //充值审核
     async auditMerchanttrade(params, pobj2, req) {
         try {
+            params.audit_user_id = req.loginUser.id;
             return await this.merchanttradeSve.auditMerchanttrade(params);
         } catch (error) {
             return system.getResult(null, `系统错误 错误信息 ${error}`);
@@ -57,6 +58,9 @@ class MerchantUserCtl extends CtlBase {
     }
 
 
+
+
+
 }
 
 module.exports = MerchantUserCtl;

esign-admin/app/base/service/impl/merchant/merchantaccountSve.js

+const system = require("../../../system");
+const ServiceBase = require("../../svems.base")
+
+class MerchantaccountService extends ServiceBase {
+    constructor() {
+        super();
+    }
+
+    async reduceAccountBalance(params) {
+        try {
+            return await this.callms("sve_merchant", "reduceAccountBalance", params);
+        } catch (error) {
+            return system.getResult(null, `系统错误 错误信息 ${error}`);
+        }
+    }
+
+    async addordelavailable(params) {
+        try {
+            return await this.callms("sve_merchant", "addordelavailable", params);
+        } catch (error) {
+            return system.getResult(null, `系统错误 错误信息 ${error}`);
+        }
+    }
+
+}
+
+module.exports = MerchantaccountService;

esign-admin/app/front/entry/public/apidoc/README.md

@@ -10,6 +10,8 @@
 
 ## 商户
 　　1 [商户接口](/doc/merchant/merchant.md)
+## 商户
+　　1 [商户接口](/doc/merchant/chantaccount.md)
 
 ## 订单
 　　1 [订单接口](/doc/saas/order.md)

esign-admin/app/front/entry/public/apidoc/merchant/merchantaccount.md

+[返回主目录](/doc)
+
+<a name="menu">目录</a>
+1. [减少余额](#reduceAccountBalance)
+1. [加减可用余额](#addordelavailable)
+1. [代客下单流水](#valetorder)
+
+## **<a name="reduceAccountBalance"> 减少余额</a>**
+[返回到目录](#menu)
+##### URL
+[/web/merchant/merchantaccountCtl/reduceAccountBalance]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+
+``` javascript
+
+    {
+        "merchant_id":"12805595251001601",  //商户ID
+        "amount": 10000                     //金额 
+    }
+
+```
+
+#### 返回结果
+```javascript
+
+{
+    "status": 0,
+    "msg": "success",
+    "data": [
+        null,
+        1
+    ],
+    "requestid": "67931cbaf71d4a7c8e70db387cf6adfd"
+}
+```
+
+
+## **<a name="addordelavailable"> 加减可用余额</a>**
+[返回到目录](#menu)
+##### URL
+[/web/merchant/merchantaccountCtl/addordelavailable]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+
+``` javascript
+
+    {
+        "merchant_id":"12805595251001601",  //商户ID
+        "amount":-10000                     //金额   正数为加  负数为减    
+    }
+
+```
+#### 返回结果
+```javascript
+{
+    "status": 0,
+    "msg": "success",
+    "data": [
+        null,
+        1
+    ],
+    "requestid": "67931cbaf71d4a7c8e70db387cf6adfd"
+}
+
+```
+
+
+## **<a name="valetorder"> 代课下单流水</a>**
+[返回到目录](#menu)
+##### URL
+[/web/merchant/merchanttradeCtl/valetorder]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+
+``` javascript
+
+    {
+        "merchant_id":"12805595251001601", //商户ID
+        "trade_data_id":"xxxxx",           //流水号
+        "amount":100,                      //交易金额
+        "trade_voucher":"凭证"              //交易凭证     
+
+    }
+
+```
+#### 返回结果
+```javascript
+{
+    "status": 0,
+    "msg": "success",
+    "data": {
+        "version": 0,
+        "merchant_id": "12805595251001601",
+        "trade_time": "2020-06-29T08:27:00.000Z",
+        "amount": 10000,
+        "trade_voucher": "凭证",
+        "trade_type": 1,
+        "pay_type": 2,
+        "amount_type": 1,
+        "trade_data_id": "20200630174148",
+        "available_amount": 10000,
+        "balance_amount": 12405600,
+        "id": "13685748088000638",
+        "updated_at": "2020-06-30T09:41:48.920Z",
+        "created_at": "2020-06-30T09:41:48.920Z"
+    },
+    "requestid": "d765cf11463d44b4a76edbb6a069346a"
+}
+
+```
+
+
+