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

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

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

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

@@ -9,6 +9,7 @@ class MerchantaccountCtl extends CtlBase {
     constructor() {
     constructor() {
         super();
         super();
         this.merchantaccountSve = system.getObject("service.merchant.merchantaccountSve");
         this.merchantaccountSve = system.getObject("service.merchant.merchantaccountSve");
+        this.merchantSve = system.getObject("service.merchant.merchantSve");
     }
     }
 
 
     async reduceAccountBalance(params, pobj2, req) {
     async reduceAccountBalance(params, pobj2, req) {
@@ -27,6 +28,14 @@ class MerchantaccountCtl extends CtlBase {
         }
         }
     }
     }
 
 
+    async merchantAccountList(params, pobj2, req) {
+        try {
+            return await this.merchantaccountSve.merchantAccountList(params);
+        } catch (error) {
+            return system.getResult(null, `系统错误 错误信息 ${error}`);
+        }
+    }
+
 
 
 }
 }
 
 

esign-admin/app/base/controller/impl/order/orderCtl.js

@@ -13,7 +13,7 @@ class OrderCtl extends CtlBase {
         this.productSve = system.getObject("service.product.productSve");
         this.productSve = system.getObject("service.product.productSve");
         this.ordersignlogSve = system.getObject("service.order.ordersignlogSve");
         this.ordersignlogSve = system.getObject("service.order.ordersignlogSve");
         this.orderauthlogSve = system.getObject("service.order.orderauthlogSve");
         this.orderauthlogSve = system.getObject("service.order.orderauthlogSve");
-        this.feeSve = system.getObject("service.order.feeSve");
+        this.feeSve = system.getObject("service.fee.feeSve");
     }
     }
 
 
     /**
     /**
@@ -153,7 +153,7 @@ class OrderCtl extends CtlBase {
             }
             }
             let res = await this.orderSve.getEorderById(pobj);
             let res = await this.orderSve.getEorderById(pobj);
             // 计费
             // 计费
-            await this.feeSve.setRowsFee([res.data], "engine_account_id");
+            // await this.feeSve.setRowsFee([res.data], "engine_account_id");
             return res;
             return res;
         }catch (e) {
         }catch (e) {
             console.log(e);
             console.log(e);
@@ -199,7 +199,7 @@ class OrderCtl extends CtlBase {
                 item.product_info = productMap[item.product_id];
                 item.product_info = productMap[item.product_id];
             }
             }
             // 设置计费内容
             // 设置计费内容
-            await this.feeSve.setRowsFee(res.data.rows, "engine_account_id");
+            // await this.feeSve.setRowsFee(res.data.rows, "engine_account_id");
             return res;
             return res;
         }catch (e) {
         }catch (e) {
             console.log(e);
             console.log(e);

esign-admin/app/base/controller/impl/order/ordersignlogCtl.js

@@ -108,6 +108,23 @@ class OrdersignlogCtl extends CtlBase {
         let spendedEnd = date.year() + "-" + tempMonth + '-' + tempDay + " 23:59:59";
         let spendedEnd = date.year() + "-" + tempMonth + '-' + tempDay + " 23:59:59";
         return { spendedBegin,spendedEnd };
         return { spendedBegin,spendedEnd };
     }
     }
+
+    /**
+     * fn:合同列表
+     * @param pobj
+     * @param pobj2
+     * @param req
+     * @param res
+     * @returns {Promise<void>}
+     */
+    async pageEorderContract(pobj, pobj2, req, res){
+        try{
+            return await this.ordersignlogSve.pageEorderContract(pobj);
+        }catch (e) {
+            console.log(e);
+            return system.getResult(null, `系统错误`);
+        }
+    }
 }
 }
 
 
 module.exports = OrdersignlogCtl;
 module.exports = OrdersignlogCtl;
\ No newline at end of file

esign-admin/app/base/controller/impl/product/productCtl.js

@@ -9,7 +9,7 @@ class ProductCtl extends CtlBase {
 
 
   async getPage (pobj, pobj2, req) {
   async getPage (pobj, pobj2, req) {
     try {
     try {
-      let res = await this.prodSve.getPage(pobj)
+      let res = await this.prodSve.getPage(pobj);
       return res
       return res
     } catch (error) {
     } catch (error) {
       return system.getResultFail(500, err.message)
       return system.getResultFail(500, err.message)

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

@@ -22,6 +22,14 @@ class MerchantaccountService extends ServiceBase {
         }
         }
     }
     }
 
 
+    async merchantAccountList(params) {
+        try {
+            return await this.callms("sve_merchant", "merchantAccountList", params);
+        } catch (error) {
+            return system.getResult(null, `系统错误 错误信息 ${error}`);
+        }
+    }
+
 }
 }
 
 
 module.exports = MerchantaccountService;
 module.exports = MerchantaccountService;

esign-admin/app/base/service/impl/order/ordersignlogSve.js

@@ -23,6 +23,15 @@ class UserService extends ServiceBase {
     async pageEorderSignLog(params){
     async pageEorderSignLog(params){
         return await this.callms("sve_order", "pageEorderSignLog", params);
         return await this.callms("sve_order", "pageEorderSignLog", params);
     }
     }
+
+    /**
+     * fn:签署合同列表（分页）
+     * @param params
+     * @returns {Promise<void>}
+     */
+    async pageEorderContract(params){
+        return await this.callms("sve_order", "pageEorderContract", params);
+    }
 }
 }
 
 
 module.exports = UserService;
 module.exports = UserService;
\ No newline at end of file

esign-admin/app/base/system.js

@@ -184,10 +184,11 @@ class System {
 		var path = "/api/op/action/springboard";
 		var path = "/api/op/action/springboard";
 		if (settings.env == "dev") {
 		if (settings.env == "dev") {
 			let local = "http://127.0.0.1";
 			let local = "http://127.0.0.1";
+			let liangwenkai = "http://192.168.210.210";
 			let dev = "http://39.107.234.14";
 			let dev = "http://39.107.234.14";
 			return {
 			return {
 				// 产品引擎
 				// 产品引擎
-				engine_product: dev + ":3571" + path,
+				engine_product: liangwenkai + ":3571" + path,
 				// 计费引擎
 				// 计费引擎
 				engine_fee: local + ":3572" + path,
 				engine_fee: local + ":3572" + path,
 				// 认证引擎
 				// 认证引擎

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

@@ -7,8 +7,8 @@
 3. [根据 id 数组查询](#getByIds)
 3. [根据 id 数组查询](#getByIds)
 4. [获取组合产品子产品列表](#getItems)
 4. [获取组合产品子产品列表](#getItems)
 5. [添加/更新产品](#createOrUpdate)
 5. [添加/更新产品](#createOrUpdate)
-6. [获取api (list格式)](#apiList)
-7. [获取api (object格式)](#apiMap)
+6. [获取 api (list 格式)](#apiList)
+7. [获取 api (object 格式)](#apiMap)
 
 
 ## **<a name="getPage"> 产品分页查询 </a>**
 ## **<a name="getPage"> 产品分页查询 </a>**
 
 
@@ -339,6 +339,7 @@
 | source_id    | number   | 可选     | 产品来源 id 默认 10001                                                           |
 | source_id    | number   | 可选     | 产品来源 id 默认 10001                                                           |
 | product_name | string   | 必选     | 产品名称                                                                         |
 | product_name | string   | 必选     | 产品名称                                                                         |
 | product_type | number   | 必选     | 产品类型 1: 单产品 2: 组合产品                                                   |
 | product_type | number   | 必选     | 产品类型 1: 单产品 2: 组合产品                                                   |
+| product_desc | string   | 可选     | 产品描述                                                                         |
 | price        | number   | 可选     | 默认 0                                                                           |
 | price        | number   | 可选     | 默认 0                                                                           |
 | cost         | number   | 可选     | 默认 0                                                                           |
 | cost         | number   | 可选     | 默认 0                                                                           |
 | api          | string   | 可选     |                                                                                  |
 | api          | string   | 可选     |                                                                                  |
@@ -371,7 +372,8 @@
     "requestid":"e6f7a5e50e404296ad47c92f43a54de4"
     "requestid":"e6f7a5e50e404296ad47c92f43a54de4"
 }
 }
 ```
 ```
-## **<a name="apiList"> 获取api </a>**
+
+## **<a name="apiList"> 获取 api </a>**
 
 
 [返回到目录](#menu)
 [返回到目录](#menu)
 
 
@@ -410,7 +412,7 @@
 }
 }
 ```
 ```
 
 
-## **<a name="apiMap"> 获取api </a>**
+## **<a name="apiMap"> 获取 api </a>**
 
 
 [返回到目录](#menu)
 [返回到目录](#menu)
 
 
@@ -448,4 +450,4 @@
     },
     },
     "requestid":"08483f755eeb48928e7eb201252b8476"
     "requestid":"08483f755eeb48928e7eb201252b8476"
 }
 }
-```
+```
\ No newline at end of file