gsb

xggsve-order/app/base/db/impl/saas/saasorderbusinessmenDao.js

@@ -5,18 +5,26 @@ class SaasorderbusinessmenDao extends Dao {
     super(Dao.getModelName(SaasorderbusinessmenDao));
     super(Dao.getModelName(SaasorderbusinessmenDao));
   }
   }
 
 
-  async mapByCreditCodes(creditCodes, attrs) {
+  async mapByCreditCodes(params) {
+    let creditCodes = params.creditCodes;
+    let attrs = params.attrs || "*";
     let result = {};
     let result = {};
     if (!creditCodes || creditCodes.length == 0) {
     if (!creditCodes || creditCodes.length == 0) {
       return result;
       return result;
     }
     }
     let sql = [];
     let sql = [];
     sql.push("SELECT");
     sql.push("SELECT");
-    sql.push(attrs || "*");
+    sql.push(attrs);
     sql.push("FROM");
     sql.push("FROM");
     sql.push(this.model.tableName);
     sql.push(this.model.tableName);
     sql.push("WHERE credit_code IN (:creditCodes)");
     sql.push("WHERE credit_code IN (:creditCodes)");
-    let list = await this.customQuery(sql.join(" "), {creditCodes: creditCodes}) || [];
+    if (params.saas_merchant_id) {
+      sql.push("AND merchant_id = :saas_merchant_id");
+    }
+    if (params.merchant_id) {
+      sql.push("AND merchant_id = :merchant_id");
+    }
+    let list = await this.customQuery(sql.join(" "), params) || [];
     if (list.length == 0) {
     if (list.length == 0) {
       return result;
       return result;
     }
     }

xggsve-order/app/base/service/impl/saas/saasorderSve.js

@@ -557,7 +557,7 @@ class SaasOrderService extends ServiceBase {
   }
   }
 
 
   async mapByCreditCodes(params) {
   async mapByCreditCodes(params) {
-    let rs = await this.saasorderbusinessmenDao.mapByCreditCodes(params.creditCodes, params.attrs) || {};
+    let rs = await this.saasorderbusinessmenDao.mapByCreditCodes(params) || {};
     return system.getResultSuccess(rs);
     return system.getResultSuccess(rs);
   }
   }