gsb

xggsve-trade/app/base/db/impl/trade/storderitemDao.js

 const system = require("../../../system");
 const system = require("../../../system");
 const Dao = require("../../dao.base");
 const Dao = require("../../dao.base");
+
 class StOrderItemDao extends Dao {
 class StOrderItemDao extends Dao {
   constructor() {
   constructor() {
     super(Dao.getModelName(StOrderItemDao));
     super(Dao.getModelName(StOrderItemDao));
   }
   }
 
 
   async byIds(params) {
   async byIds(params) {
-    let attrs = params.attr || "*";
+    let attrs = params.attrs || "*";
     let ids = params.ids;
     let ids = params.ids;
     if (!ids || ids.length == 0) {
     if (!ids || ids.length == 0) {
       return [];
       return [];
@@ -15,11 +16,18 @@ class StOrderItemDao extends Dao {
     let sql = [];
     let sql = [];
     sql.push("SELECT");
     sql.push("SELECT");
     sql.push(attrs);
     sql.push(attrs);
+    sql.push("FROM");
     sql.push(this.model.tableName);
     sql.push(this.model.tableName);
     sql.push("WHERE id IN (:ids) ");
     sql.push("WHERE id IN (:ids) ");
     if (params.trade_statuses && params.trade_statuses.length > 0) {
     if (params.trade_statuses && params.trade_statuses.length > 0) {
       sql.push("AND trade_status IN (:trade_statuses)");
       sql.push("AND trade_status IN (:trade_statuses)");
     }
     }
+    if (params.saas_merchant_id) {
+      sql.push("AND saas_merchant_id IN (:saas_merchant_id)");
+    }
+    if (params.unInvoice) {
+      sql.push("AND saas_invoice_id = ''");
+    }
     return await this.customQuery(sql.join(" "), params);
     return await this.customQuery(sql.join(" "), params);
   }
   }
 
 
@@ -66,8 +74,9 @@ class StOrderItemDao extends Dao {
     }
     }
     return result;
     return result;
   }
   }
+
   async genTradeNo(orderId, t) {
   async genTradeNo(orderId, t) {
-    let sql =`UPDATE ${this.model.tableName} SET trade_no = CONCAT('T', id, SUBSTR(order_id, LENGTH(order_id) - 2, 4), SUBSTRING(REPLACE(RAND(),'.',''),3,4)) WHERE order_id = :orderId`;
+    let sql = `UPDATE ${this.model.tableName} SET trade_no = CONCAT('T', id, SUBSTR(order_id, LENGTH(order_id) - 2, 4), SUBSTRING(REPLACE(RAND(),'.',''),3,4)) WHERE order_id = :orderId`;
     return await this.customUpdate(sql, {orderId: orderId}, t);
     return await this.customUpdate(sql, {orderId: orderId}, t);
   }
   }
 
 
@@ -151,4 +160,5 @@ class StOrderItemDao extends Dao {
     }
     }
   }
   }
 }
 }
+
 module.exports = StOrderItemDao;
 module.exports = StOrderItemDao;