dd

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

@@ -182,11 +182,21 @@ class StOrderItemDao extends Dao {
     if (params.unInvoice) {
     if (params.unInvoice) {
       sql.push("AND saas_invoice_id = ''");
       sql.push("AND saas_invoice_id = ''");
     }
     }
+    if (params.saas_invoice_id) {
+      sql.push("AND saas_invoice_id = :saas_invoice_id");
+    }
+    if(params.data_ids && params.data_ids.length>0){
+      sql.push("AND id in (:data_ids)");
+    }
   }
   }
 
 
-  async  invoiceTrade(id,order_type){
-    let sql = `select * from st_order_item where saas_invoice_id =:id and order_type =:order_type`;
-    return await this.customQuery(sql, {id:id,order_type:order_type});
+  async  invoiceTrade(params){
+    let sql = [];
+    sql.push(`select * from st_order_item `);
+    sql.push("WHERE deleted_at IS NULL and 1=1 ");
+    this.setCondition(sql, params);
+    sql.push("ORDER BY created_at DESC");
+    return await this.customQuery(sql.join(" "), params);
   }
   }
 
 
 
 

xggsve-trade/app/base/service/impl/trade/storderitemSve.js

@@ -109,7 +109,15 @@ class StOrderItemService extends ServiceBase {
       return system.getResult(null,`订单类型不能为空`);
       return system.getResult(null,`订单类型不能为空`);
     }
     }
     try {
     try {
-      let res = await this.dao.invoiceTrade(this.trim(params.id),this.trim(params.order_type)) || [];
+      let tparam = {order_type:this.trim(params.order_type)};
+      if (params.data_ids && params.data_ids.length > 0) {
+        tparam.data_ids = params.data_ids;
+      } else if (params.id) {
+        tparam.saas_invoice_id = params.id;
+      } else {
+        return system.getResult([]);
+      }
+      let res = await this.dao.invoiceTrade(tparam) || [];
       for(let item of res){
       for(let item of res){
         this.handleDate(item, ['updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
         this.handleDate(item, ['updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
       }          
       }