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

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

@@ -85,7 +85,7 @@ class ActionAPI extends APIBase {
                     opResult = await this.obusinessmenSve.queryObusinessmen(action_body);
                     opResult = await this.obusinessmenSve.queryObusinessmen(action_body);
                     break;
                     break;
                 case "businessmenPage":
                 case "businessmenPage":
-                    opResult = await this.businessmenSve.apiPage(action_body);
+                    opResult = await this.obusinessmenSve.businessmenPage(action_body);
                     break;
                     break;
 
 
                 //******************************************************************** */
                 //******************************************************************** */

xggsve-order/app/base/db/impl/order/obusinessmenDao.js

@@ -13,19 +13,28 @@ class ObusinessmenDao extends Dao {
     sql.push("FROM `o_businessmen` t1");
     sql.push("FROM `o_businessmen` t1");
     sql.push("WHERE 1 = 1");
     sql.push("WHERE 1 = 1");
 
 
+    this.setCondition(sql, params);
 
 
+    let rs = await this.customQuery(sql.join(" "), params);
+    if (!rs || rs.length == 0) {
+      return 0;
+    }
+    return rs[0].num || 0;
   }
   }
 
 
   async listByCondition(params) {
   async listByCondition(params) {
+    let sql = [];
     sql.push("SELECT");
     sql.push("SELECT");
     sql.push("t1.*");
     sql.push("t1.*");
     sql.push("FROM `o_businessmen` t1");
     sql.push("FROM `o_businessmen` t1");
     sql.push("WHERE 1 = 1");
     sql.push("WHERE 1 = 1");
 
 
-
     this.setCondition(sql, params);
     this.setCondition(sql, params);
 
 
+    sql.push("ORDER BY t1.id DESC");
+    sql.push("LIMIT :startRow, :pageSize");
 
 
+    return await this.customQuery(sql.join(" "), params);
   }
   }
 
 
   setCondition(sql, params) {
   setCondition(sql, params) {

xggsve-order/app/base/service/impl/order/obusinessmenSve.js

@@ -104,59 +104,24 @@ class ObusinessmenService extends ServiceBase {
     }
     }
   }
   }
 
 
-
   async businessmenPage(params) {
   async businessmenPage(params) {
-    let currentPage = Number(params.currentPage || 1);
-    let pageSize = Number(params.pageSize || 10);
-
-    let order_id = this.trim(params.order_id);
-    let name = this.trim(params.name);
-    let bd_id = this.trim(params.bd_id);
-    let bd_path = this.trim(params.bd_path);
-
-    let legal_name = this.trim(params.legal_name);
-    let legal_mobile = this.trim(params.legal_mobile);
-    let legal_idcard = this.trim(params.legal_idcard);
-    let credit_code = this.trim(params.credit_code);
-
+    params.currentPage = Number(params.currentPage || 1);
+    params.pageSize = Number(params.pageSize || 10);
 
 
+    params.startRow = (params.currentPage - 1) * params.pageSize;
 
 
-    var where = {};
-
-    var orderby = [
-      ["id", 'desc']
-    ];
-
-    if (bdId) {
-      where.merchant_id = bdId;
+    let total = await this.dao.countByCondition(params);
+    if (total == 0) {
+      return system.getResultSuccess({count: 0, rows: []});
     }
     }
-    if (bdPath && bdPath.length > 0) {
-      where.id = {
-        [this.db.Op.like]: bdPath + "%"
-      }
-    }
-    if (userId) {
-      where.userId = userId;
-    }
-    if (ostatuses && ostatuses.length > 0) {
-      where.ostatus = {
-        [this.db.Op.in]: ostatuses
-      }
-    }
-
-    this.addWhereTime(where, 'created_at', params.createdBegin, params.createdEnd);
-
-    var page = await this.getPageList(currentPage, pageSize, where, orderby, null);
-    if (page && page.rows) {
-      for (var row of page.rows) {
-        await this.dao.setRowCodeName(row, "status");
-        await this.dao.setRowCodeName(row, "ostatus");
-        await this.dao.setRowCodeName(row, "deliverType");
 
 
+    let list = await this.dao.listByCondition(params);
+    if (list) {
+      for (var row of list) {
         this.handleDate(row, ["created_at", "assignTime"], null, -8);
         this.handleDate(row, ["created_at", "assignTime"], null, -8);
       }
       }
     }
     }
-    return system.getResultSuccess(page);
+    return system.getResultSuccess({count: total, rows: list});
   }
   }
 }
 }
 
 

xggsve-order/app/base/service/impl/order/oorderstatusSve.js

@@ -584,6 +584,8 @@ class OorderstatusService extends ServiceBase {
     }
     }
     let _order = params._order;
     let _order = params._order;
 
 
+    let _orderInfo = await this.oorderinforegDao.findById(_order.id);
+
     let _obusinessmenProperty = {};
     let _obusinessmenProperty = {};
     _obusinessmenProperty.name = this.trim(params.name);
     _obusinessmenProperty.name = this.trim(params.name);
     _obusinessmenProperty.credit_code = this.trim(params.credit_code);
     _obusinessmenProperty.credit_code = this.trim(params.credit_code);
@@ -592,6 +594,10 @@ class OorderstatusService extends ServiceBase {
     _obusinessmenProperty.reg_date = this.trim(params.reg_date);
     _obusinessmenProperty.reg_date = this.trim(params.reg_date);
     _obusinessmenProperty.business_img = this.trim(params.business_img);
     _obusinessmenProperty.business_img = this.trim(params.business_img);
     _obusinessmenProperty.business_gov_file = this.trim(params.business_gov_file);
     _obusinessmenProperty.business_gov_file = this.trim(params.business_gov_file);
+    _obusinessmenProperty.order_id = _order.id;
+    _obusinessmenProperty.legal_name = _orderInfo.legal_name;
+    _obusinessmenProperty.legal_mobile = _orderInfo.legal_mobile;
+    _obusinessmenProperty.legal_idcard = _orderInfo.id_card;
     _obusinessmenProperty.bd_id = this.trim(params.bd_id);
     _obusinessmenProperty.bd_id = this.trim(params.bd_id);
     _obusinessmenProperty.bd_path = this.trim(params.bd_path);
     _obusinessmenProperty.bd_path = this.trim(params.bd_path);