d

esign-sve-order/app/base/db/impl/eorder/eorderDao.js

@@ -54,22 +54,22 @@ class EorderDao extends Dao{
             sql.push('and audit_user_id=:audit_user_id');
         }
         if (params.createdBegin) {
-            sql.push("AND t1.created_at >= :createdBegin");
+            sql.push("AND created_at >= :createdBegin");
         }
         if (params.createdEnd) {
-            sql.push("AND t1.created_at <= :createdEnd");
+            sql.push("AND created_at <= :createdEnd");
         }
         if (params.payBegin) {
-            sql.push("AND t1.pay_date >= :payBegin");
+            sql.push("AND pay_date >= :payBegin");
         }
         if (params.payEnd) {
-            sql.push("AND t1.pay_date <= :payEnd");
+            sql.push("AND pay_date <= :payEnd");
         }
         if (params.auditBegin) {
-            sql.push("AND t1.audit_date >= :auditBegin");
+            sql.push("AND audit_date >= :auditBegin");
         }
         if (params.auditEnd) {
-            sql.push("AND t1.audit_date <= :auditEnd");
+            sql.push("AND audit_date <= :auditEnd");
         }
     }
 
@@ -82,9 +82,10 @@ class EorderDao extends Dao{
         let sql = [];
         sql.push('SELECT *  FROM e_order  WHERE 1 = 1 ');
         this.setEorderParams(sql,params);
-        sql.push("ORDER BY t1.created_at DESC");
+        sql.push("ORDER BY created_at DESC");
         sql.push("LIMIT :startRow, :pageSize");
         let list = await this.customQuery(sql.join(" "), params);
+
         return list ||[];
     }
 

esign-sve-order/app/base/db/impl/eorder/eorderauthlogDao.js

@@ -5,5 +5,51 @@ class EorderauthlogDao extends Dao{
         super(Dao.getModelName(EorderauthlogDao));
     }
 
+    /**
+     * fn:分页查询计数
+     * @param params
+     * @returns {Promise<void>}
+     */
+    async countEorderAuthLog(params){
+        let sql = [];
+        sql.push('SELECT COUNT(1) AS eorderauthlogCount FROM e_order_auth_log WHERE 1 = 1 ');
+        this.setEorderAuthLogParams(sql,params);
+        let list = await this.customQuery(sql.join(" "), params);
+        if(!list || list.length==0){
+            return {count:0};
+        }
+        return list[0];
+    }
+
+    async setEorderAuthLogParams(sql,params){
+        if(params.id){
+            sql.push('and id=:id');
+        }
+        if(params.order_id){
+            sql.push('and order_id=:order_id');
+        }
+        if (params.spendedBegin) {
+            sql.push("AND spended_at >= :spendedBegin");
+        }
+        if (params.spendedEnd) {
+            sql.push("AND spended_at <= :spendedEnd");
+        }
+    }
+
+    /**
+     * fn:分页查询
+     * @param params
+     * @returns {Promise<void>}
+     */
+    async pageEorderAuthLog(params){
+        let sql = [];
+        sql.push('SELECT *  FROM e_order_auth_log WHERE 1 = 1 ');
+        this.setEorderParams(sql,params);
+        sql.push("ORDER BY spended_at DESC");
+        sql.push("LIMIT :startRow, :pageSize");
+        let list = await this.customQuery(sql.join(" "), params);
+        return list ||[];
+    }
+
 }
 module.exports=EorderauthlogDao;

esign-sve-order/app/base/db/impl/eorder/eordersignlogDao.js

@@ -5,5 +5,51 @@ class EordersignlogDao extends Dao{
         super(Dao.getModelName(EordersignlogDao));
     }
 
+    /**
+     * fn:分页查询计数
+     * @param params
+     * @returns {Promise<void>}
+     */
+    async countEorderSignLog(params){
+        let sql = [];
+        sql.push('SELECT COUNT(1) AS eordersignlogCount FROM e_order_sign_log WHERE 1 = 1 ');
+        this.setEorderSignLogParams(sql,params);
+        let list = await this.customQuery(sql.join(" "), params);
+        if(!list || list.length==0){
+            return {count:0};
+        }
+        return list[0];
+    }
+
+    async setEorderSignLogParams(sql,params){
+        if(params.id){
+            sql.push('and id=:id');
+        }
+        if(params.order_id){
+            sql.push('and order_id=:order_id');
+        }
+        if (params.spendedBegin) {
+            sql.push("AND spended_at >= :spendedBegin");
+        }
+        if (params.spendedEnd) {
+            sql.push("AND spended_at <= :spendedEnd");
+        }
+    }
+
+    /**
+     * fn:分页查询
+     * @param params
+     * @returns {Promise<void>}
+     */
+    async pageEorderSignLog(params){
+        let sql = [];
+        sql.push('SELECT *  FROM e_order_sign_log WHERE 1 = 1 ');
+        this.setEorderParams(sql,params);
+        sql.push("ORDER BY spended_at DESC");
+        sql.push("LIMIT :startRow, :pageSize");
+        let list = await this.customQuery(sql.join(" "), params);
+        return list ||[];
+    }
+
 }
 module.exports=EordersignlogDao;

esign-sve-order/app/base/service/impl/eorder/eorderauthlogSve.js

@@ -17,7 +17,7 @@ class EorderauthlogSve extends ServiceBase {
       return system.getResult(null, `参数错误 订单ID不能为空`);
     }
     if(!params.product_id){
-      return system.getResult(null, `参数错误 订单ID不能为空`);
+      return system.getResult(null, `参数错误 产品ID不能为空`);
     }
     if(!params.user_name){
       return system.getResult(null, `参数错误 使用方不能为空`);
@@ -26,7 +26,7 @@ class EorderauthlogSve extends ServiceBase {
       return system.getResult(null, `参数错误 实际使用方不能为空`);
     }
     params.spended_num = Number(params.spended_num || 0);
-
+    params.spended_at = params.spended_at?params.spended_at:new Date();
     try{
       let orderBean = await this.eorderDao.dao.model.findOne({
         where:{
@@ -50,10 +50,27 @@ class EorderauthlogSve extends ServiceBase {
    * @returns {Promise<void>}
    */
   async pageEorderAuthLog(params){
-
+    params.currentPage = Number(params.currentPage || 1);
+    params.pageSize = Number(params.pageSize || 10);
+    params.startRow = (params.currentPage - 1) * params.pageSize;
+    try{
+      let countRes = await this.dao.countEorderAuthLog(params);
+      if(countRes.eorderauthlogCount==0){
+        return system.getResult({count: 0, row: []});
+      }
+      let list =await  this.dao.pageEorderAuthLog(params);
+      if(!list || list.length==0){
+        return system.getResult({count: 0, row: []});
+      }
+      for (let item of list) {
+        this.handleDate(item,['spended_at','created_at'],null,null)
+      }
+      return system.getResult({count: countRes.eorderauthlogCount, rows: list});
+    }catch (e) {
+      console.log(e);
+      return system.getResult(null, `系统错误`);
+    }
   }
-
-
 }
 
 module.exports = EorderauthlogSve;
\ No newline at end of file

esign-sve-order/app/base/service/impl/eorder/eordersignlogSve.js

@@ -4,7 +4,7 @@ const ServiceBase = require("../../sve.base")
 class EordersignlogSve extends ServiceBase {
   constructor() {
     super("eordersignlog", ServiceBase.getDaoName(EordersignlogSve));
-    // this.accounttradeDao = system.getObject("db.account.accounttradeDao");
+    this.eorderDao = system.getObject("db.eorder.eorderDao");
   }
 
   /**
@@ -13,6 +13,41 @@ class EordersignlogSve extends ServiceBase {
    * @returns {Promise<void>}
    */
   async saveEorderSignLog(params) {
+    if(!params.order_id){
+      return system.getResult(null, `参数错误 订单ID不能为空`);
+    }
+    if(!params.product_id){
+      return system.getResult(null, `参数错误 产品ID不能为空`);
+    }
+    if(!params.engine_contract_name){
+      return system.getResult(null, `参数错误 签署任务名称不能为空`);
+    }
+    if(!params.engine_contract_id){
+      return system.getResult(null, `参数错误 签署ID不能为空`);
+    }
+    if(!params.actual_spend_name){
+      return system.getResult(null, `参数错误 实际使用方不能为空`);
+    }
+    params.spended_num = Number(params.spended_num || 0);
+    params.spended_at = params.spended_at?params.spended_at:new Date();
+    params.platform_id=params.platform_id?params.platform_id:'';
+    if(!params.platform_name){
+      return system.getResult(null, `参数错误 平台名称不能为空`);
+    }
+    try{
+      let orderBean = await this.eorderDao.dao.model.findOne({
+        where:{
+          order_id:this.trim(params.order_id)
+        }
+      });
+      if(!orderBean){
+        return system.getResult(null, `订单【${params.order_id}】不存在`);
+      }
+      await this.dao.create(params);
+    }catch (e) {
+      console.log(e);
+      return system.getResult(null,`系统错误`);
+    }
 
   }
 
@@ -22,7 +57,26 @@ class EordersignlogSve extends ServiceBase {
    * @returns {Promise<void>}
    */
   async pageEorderSignLog(params){
-
+    params.currentPage = Number(params.currentPage || 1);
+    params.pageSize = Number(params.pageSize || 10);
+    params.startRow = (params.currentPage - 1) * params.pageSize;
+    try{
+      let countRes = await this.dao.countEorderSignLog(params);
+      if(countRes.eordersignlogCount==0){
+        return system.getResult({count: 0, row: []});
+      }
+      let list =await  this.dao.pageEorderSignLog(params);
+      if(!list || list.length==0){
+        return system.getResult({count: 0, row: []});
+      }
+      for (let item of list) {
+        this.handleDate(item,['spended_at','created_at'],null,null)
+      }
+      return system.getResult({count: countRes.eordersignlogCount, rows: list});
+    }catch (e) {
+      console.log(e);
+      return system.getResult(null, `系统错误`);
+    }
   }
 
 }