dd

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

@@ -197,6 +197,9 @@ class ActionAPI extends APIBase {
                 case "saasorderbusinessmenPage":       // 订单信息
                 case "saasorderbusinessmenPage":       // 订单信息
                     opResult = await this.saasorderbusinessmenSve.saasorderbusinessmenPage(action_body);
                     opResult = await this.saasorderbusinessmenSve.saasorderbusinessmenPage(action_body);
                     break;
                     break;
+                case "assorderBusinessmenInfo":       // 订单信息
+                    opResult = await this.saasorderbusinessmenSve.assorderBusinessmenInfo(action_body);
+                    break;
                     
                     
                 //******************************************************************** */
                 //******************************************************************** */
 
 

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

@@ -66,6 +66,12 @@ class SaasorderbusinessmenDao extends Dao {
     if (params.merchant_id) {
     if (params.merchant_id) {
       sql.push(`AND merchant_id = :merchant_id `);
       sql.push(`AND merchant_id = :merchant_id `);
     }
     }
+    if (params.merchant_app_user_id) {
+      sql.push(`AND merchant_app_user_id = :merchant_app_user_id `);
+    }
+    if (params.merchant_id) {
+      sql.push(`AND merchant_id = :merchant_id `);
+    }
   }
   }
 
 
 
 
@@ -82,5 +88,7 @@ class SaasorderbusinessmenDao extends Dao {
     sql.push(`limit ${params.startRow} ,${params.pageSize}`);
     sql.push(`limit ${params.startRow} ,${params.pageSize}`);
     return await this.customQuery(sql.join(" "), params);
     return await this.customQuery(sql.join(" "), params);
   }
   }
+
+
 }
 }
-module.exports = SaasorderbusinessmenDao;
+module.exports = SaasorderbusinessmenDao;
\ No newline at end of file

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

@@ -237,6 +237,7 @@ class SaasOrderService extends ServiceBase {
         saasorderbusinessmen.merchant_id = order.merchant_id;
         saasorderbusinessmen.merchant_id = order.merchant_id;
         saasorderbusinessmen.product_id = order.product_id;
         saasorderbusinessmen.product_id = order.product_id;
         saasorderbusinessmen.saas_order_id = order.saas_order_id;
         saasorderbusinessmen.saas_order_id = order.saas_order_id;
+        saasorderbusinessmen.merchant_app_user_id = order.merchant_app_user_id || "";
         await this.saasorderbusinessmenDao.create(saasorderbusinessmen);
         await this.saasorderbusinessmenDao.create(saasorderbusinessmen);
       }
       }
       return system.getResultSuccess();
       return system.getResultSuccess();

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

@@ -17,7 +17,7 @@ class SaasorderbusinessmenService extends ServiceBase {
    * @param params
    * @param params
    * @returns {Promise<{msg: *, data, bizmsg: *|string, status: number}>}
    * @returns {Promise<{msg: *, data, bizmsg: *|string, status: number}>}
    */
    */
-  async saasorderbusinessmenPage(params){
+  async saasorderbusinessmenPage(params) {
     let where = {};
     let where = {};
     if (params.credit_code) {
     if (params.credit_code) {
       where.credit_code = this.trim(params.credit_code);
       where.credit_code = this.trim(params.credit_code);
@@ -33,9 +33,9 @@ class SaasorderbusinessmenService extends ServiceBase {
     params.startRow = (params.currentPage - 1) * params.pageSize;
     params.startRow = (params.currentPage - 1) * params.pageSize;
 
 
     try {
     try {
-      let countRes = await  this.dao.saasorderbusinessmenCount(params);
-      if(countRes.count==0){
-        return system.getResult({count:0, rows: []});
+      let countRes = await this.dao.saasorderbusinessmenCount(params);
+      if (countRes.count == 0) {
+        return system.getResult({count: 0, rows: []});
       }
       }
       let res = await this.dao.saasorderbusinessmenPage(params);
       let res = await this.dao.saasorderbusinessmenPage(params);
 
 
@@ -47,14 +47,35 @@ class SaasorderbusinessmenService extends ServiceBase {
         item.special_tax_ladder = JSON.parse(item.special_tax_ladder);
         item.special_tax_ladder = JSON.parse(item.special_tax_ladder);
         item.special_other_ladder = JSON.parse(item.special_other_ladder);
         item.special_other_ladder = JSON.parse(item.special_other_ladder);
       }
       }
-      return system.getResult({count:countRes.count, rows: res});
-    }catch (e) {
+      return system.getResult({count: countRes.count, rows: res});
+    } catch (e) {
       console.log(e);
       console.log(e);
       return system.getResult(nul, `系统错误`);
       return system.getResult(nul, `系统错误`);
     }
     }
   }
   }
 
 
-
+  /**
+   * 获取个体户信息
+   * @param params
+   * @returns {Promise<{msg: string, data: (*|null), bizmsg: string, status: number}>}
+   */
+  async assorderBusinessmenInfo(params){
+    try {
+      let res = await this.dao.model.findAll({
+        where:{
+          merchant_app_user_id: this.trim(params.merchant_app_user_id),
+          merchant_id:this.trim(params.merchant_id)
+        },
+        attributes:params.attrs
+      });
+      return system.getResult(res || []);
+    }catch (e) {
+      console.log(e);
+      return system.getResult(null, `系统错误`);
+    }
+  }
 }
 }
 
 
+
+
 module.exports = SaasorderbusinessmenService;
 module.exports = SaasorderbusinessmenService;
\ No newline at end of file