Merge branch 'xggsve-merchant' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-merchant

xggsve-merchant/app/base/api/impl/op/action.js

@@ -110,9 +110,6 @@ class ActionAPI extends APIBase {
             case "merchantTitleAddrPage":           //查询 title and addr list
             case "merchantTitleAddrPage":           //查询 title and addr list
                 opResult = await this.saasmerchantSve.merchantTitleAddrPage(action_body);
                 opResult = await this.saasmerchantSve.merchantTitleAddrPage(action_body);
                 break;
                 break;
-            case "updateMerchantTitleAndAddr":
-                opResult = await this.saasmerchantSve.updateMerchantTitleAndAddr(action_body);
-                break;
             case "queryInvoiceTitleAndAddr":        //查询商户title&addr
             case "queryInvoiceTitleAndAddr":        //查询商户title&addr
                 opResult = await this.saasmerchantSve.queryInvoiceTitleAndAddr(action_body);
                 opResult = await this.saasmerchantSve.queryInvoiceTitleAndAddr(action_body);
                 break;
                 break;

xggsve-merchant/app/base/db/impl/merchant/saasmerchantaddrDao.js

@@ -10,7 +10,7 @@ class SaasmerchantaddrDao extends Dao {
    */
    */
   async getAllByMerchantId(id){
   async getAllByMerchantId(id){
     let sql = `select * from saas_merchant_addr where saas_merchant_id = :saas_merchant_id`;
     let sql = `select * from saas_merchant_addr where saas_merchant_id = :saas_merchant_id`;
-    return await this.customUpdate(sql.join(" "), {saas_merchant_id:id});
+    return await this.customQuery(sql, {saas_merchant_id:id});
   }
   }
 
 
  
  

xggsve-merchant/app/base/db/impl/merchant/saasmerchanttitleDao.js

@@ -5,13 +5,13 @@ class SaasmerchanttitleDao extends Dao {
     super(Dao.getModelName(SaasmerchanttitleDao));
     super(Dao.getModelName(SaasmerchanttitleDao));
   }
   }
 
 
+  /**
+   * 查询指定商户下的所有 title和地址
+   * @param {*} id 
+   */
   async getAllByMerchantId(id){
   async getAllByMerchantId(id){
     let sql = `select * from saas_merchant_title where saas_merchant_id = :saas_merchant_id`;
     let sql = `select * from saas_merchant_title where saas_merchant_id = :saas_merchant_id`;
-    return await this.customUpdate(sql.join(" "), {saas_merchant_id:id});
+    return await this.customQuery(sql, {saas_merchant_id:id});
   }
   }
-
-
-
- 
 }
 }
 module.exports = SaasmerchanttitleDao;
 module.exports = SaasmerchanttitleDao;