gsb

xgg-deliver/app/base/controller/impl/business/businessmenCtl.js

@@ -5,6 +5,7 @@ var settings = require("../../../../config/settings");
 const CtlBase = require("../../ctlms.base");
 const CtlBase = require("../../ctlms.base");
 
 
 var cacheBaseComp = null;
 var cacheBaseComp = null;
+
 class BusinessmenCtl extends CtlBase {
 class BusinessmenCtl extends CtlBase {
   constructor() {
   constructor() {
     super();
     super();
@@ -14,12 +15,37 @@ class BusinessmenCtl extends CtlBase {
 
 
   async allPage(pobj, pobj2, req) {
   async allPage(pobj, pobj2, req) {
     try {
     try {
-      var condition = {
+
+      let condition = {
         currentPage: pobj.currentPage,
         currentPage: pobj.currentPage,
         pageSize: pobj.pageSize,
         pageSize: pobj.pageSize,
-        merchantId: pobj.merchantId,
-        orderId: this.trim(pobj.orderId),
-        bstatus: pobj.status,
+        order_id: this.trim(pobj.order_id),
+        name: this.trim(pobj.name),
+        legal_name: this.trim(pobj.legal_name),
+        legal_mobile: this.trim(pobj.legal_mobile),
+        legal_idcard: this.trim(pobj.legal_idcard),
+        credit_code: this.trim(pobj.credit_code)
+      }
+      return await this.businessmenSve.allPage(condition);
+    } catch (error) {
+      console.log(error);
+      return system.getResultFail(500, "接口异常：" + error.message);
+    }
+  }
+
+  async myPage(pobj, pobj2, req) {
+    try {
+
+      let condition = {
+        currentPage: pobj.currentPage,
+        pageSize: pobj.pageSize,
+        order_id: this.trim(pobj.order_id),
+        name: this.trim(pobj.name),
+        bd_path: this.trim(req.loginUser.orgpath),
+        legal_name: this.trim(pobj.legal_name),
+        legal_mobile: this.trim(pobj.legal_mobile),
+        legal_idcard: this.trim(pobj.legal_idcard),
+        credit_code: this.trim(pobj.credit_code)
       }
       }
       return await this.businessmenSve.allPage(condition);
       return await this.businessmenSve.allPage(condition);
     } catch (error) {
     } catch (error) {
@@ -93,7 +119,7 @@ class BusinessmenCtl extends CtlBase {
     }
     }
   }
   }
 
 
-  
+
   async deliverPage(pobj, pobj2, req) {
   async deliverPage(pobj, pobj2, req) {
     try {
     try {
       var condition = {
       var condition = {
@@ -141,4 +167,5 @@ class BusinessmenCtl extends CtlBase {
   //   }
   //   }
   // }
   // }
 }
 }
+
 module.exports = BusinessmenCtl;
 module.exports = BusinessmenCtl;
\ No newline at end of file

xgg-deliver/app/base/controller/impl/order/orderCtl.js

@@ -146,7 +146,10 @@ class OrderCtl extends CtlBase {
     if (!pobj.business_gov_file) {
     if (!pobj.business_gov_file) {
       return system.getResult(null, `参数错误 工商官方文件不能为空`);
       return system.getResult(null, `参数错误 工商官方文件不能为空`);
     }
     }
-    
+
+    pobj.bd_id = req.loginUser.id;
+    pobj.bd_path = req.loginUser.orgpath;
+
     try {
     try {
       return await this.orderSve.handleStatus(pobj);
       return await this.orderSve.handleStatus(pobj);
     } catch (error) {
     } catch (error) {

xgg-deliver/app/base/service/impl/business/businessmenSve.js

@@ -11,7 +11,6 @@ class BusinessmenService extends ServiceBase {
     if (rs.status != 0 || !rs.data || !rs.data.rows) {
     if (rs.status != 0 || !rs.data || !rs.data.rows) {
       return rs;
       return rs;
     }
     }
-    await this.setMerchant(rs.data.rows);
     this.transField(rs.data.rows);
     this.transField(rs.data.rows);
     return rs;
     return rs;
   }
   }