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

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

@@ -129,9 +129,24 @@ class ActionAPI extends APIBase {
                 case "saasOrderInfo":       // 订单信息
                     opResult = await this.saasorderSve.info(action_body);
                     break;
+                case "saasOrderPlatformOrderInfo":       // 订单信息
+                    opResult = await this.saasorderSve.platformOrderInfo(action_body);
+                    break;
+                case "saasOrderMerchantOrderInfo":       // 订单信息
+                    opResult = await this.saasorderSve.merchantOrderInfo(action_body);
+                    break;
                 case "saasOrderPage":       // 订单信息
                     opResult = await this.saasorderSve.pageByCondition(action_body);
                     break;
+                case "saasOrderAudit":       // 订单信息
+                    opResult = await this.saasorderSve.audit(action_body);
+                    break;
+                case "saasOrderDeliver":       // 订单信息
+                    opResult = await this.saasorderSve.deliver(action_body);
+                    break;
+                case "saasOrderBulkOfflinePay":       // 订单信息
+                    opResult = await this.saasorderSve.bulkOfflinePay(action_body);
+                    break;
                 //******************************************************************** */
 
                 // // 订单

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

 const system = require("../../../system");
 const Dao = require("../../dao.base");
+
 class SaasOrderDao extends Dao {
   constructor() {
     super(Dao.getModelName(SaasOrderDao));
@@ -63,6 +64,10 @@ class SaasOrderDao extends Dao {
       sql.push("AND t1.audit_status = :audit_status");
     }
 
+    if (params.handle_status) {
+      sql.push("AND t1.handle_status = :handle_status");
+    }
+
     if (params.saas_merchant_id) {
       sql.push("AND t1.merchant_id = :saas_merchant_id");
     }
@@ -79,7 +84,7 @@ class SaasOrderDao extends Dao {
       sql.push("AND t2.legal_idno = :legal_idno");
     }
 
-    if(params.merchant_app_user_id) {
+    if (params.merchant_app_user_id) {
       sql.push("AND t2.merchant_app_user_id = :merchant_app_user_id");
     }
   }
@@ -110,4 +115,5 @@ class SaasOrderDao extends Dao {
   }
 
 }
+
 module.exports = SaasOrderDao;
\ No newline at end of file

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

+const system = require("../../../system");
+const Dao = require("../../dao.base");
+class SaasOrderDeliverInfoDao extends Dao {
+  constructor() {
+    super(Dao.getModelName(SaasOrderDeliverInfoDao));
+  }
+
+  async mapByIds(ids, attrs) {
+    let result = {};
+    if (!ids || ids.length == 0) {
+      return result;
+    }
+    let sql = [];
+    sql.push("SELECT");
+    sql.push(attrs || "*");
+    sql.push("FROM");
+    sql.push(this.model.tableName);
+    sql.push("WHERE id IN (:ids)");
+
+    var list = await this.customQuery(sql.join(" "), {
+      ids: ids
+    });
+    if (!list || list.length == 0) {
+      return result;
+    }
+    for (var item of list) {
+      result[item.id] = item;
+    }
+    return result;
+  }
+}
+module.exports = SaasOrderDeliverInfoDao;
\ No newline at end of file

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

+const system = require("../../../system");
+const Dao = require("../../dao.base");
+
+class SaasOrderPayDao extends Dao {
+  constructor() {
+    super(Dao.getModelName(SaasOrderPayDao));
+  }
+
+  async findByOrderId(order_id) {
+    let sql = `SELECT * FROM ${this.model.tableName} WHERE order_id = :order_id `;
+    return await this.customQuery(sql, {order_id: order_id});
+  }
+
+  async mapByIds(ids, attrs) {
+    let result = {};
+    if (!ids || ids.length == 0) {
+      return result;
+    }
+    let sql = [];
+    sql.push("SELECT");
+    sql.push(attrs || "*");
+    sql.push("FROM");
+    sql.push(this.model.tableName);
+    sql.push("WHERE id IN (:ids)");
+
+    var list = await this.customQuery(sql.join(" "), {
+      ids: ids
+    });
+    if (!list || list.length == 0) {
+      return result;
+    }
+    for (var item of list) {
+      result[item.id] = item;
+    }
+    return result;
+  }
+}
+
+module.exports = SaasOrderPayDao;
\ No newline at end of file

xggsve-order/app/base/db/models/saas/saasorder.js

@@ -5,19 +5,14 @@ module.exports = (db, DataTypes) => {
   return db.define("saasorder", {
     saas_id: DataTypes.STRING,
     merchant_id: DataTypes.STRING,
-    channel_id: DataTypes.STRING,
     product_id: DataTypes.STRING,
     deliver_order_id: DataTypes.STRING,
     merchant_app_user_id: DataTypes.STRING,
     price: DataTypes.BIGINT,
     pay_status: DataTypes.STRING,
-    pay_voucher_img: DataTypes.STRING,
     audit_status: DataTypes.STRING,
     audit_remark: DataTypes.STRING,
     handle_status: DataTypes.STRING,
-    deliver_man: DataTypes.STRING,
-    deliver_mobile: DataTypes.STRING,
-    deliver_addr: DataTypes.STRING,
   }, {
     paranoid: true, //假的删除
     underscored: true,

xggsve-order/app/base/db/models/saas/saasorderdeliverinfo.js

+const system = require("../../../system");
+const settings = require("../../../../config/settings");
+const uiconfig = system.getUiConfig2(settings.appKey);
+module.exports = (db, DataTypes) => {
+  return db.define("saasorderdeliverinfo", {
+    order_id: DataTypes.STRING,
+    pay_type: DataTypes.INTEGER,
+    amount: DataTypes.BIGINT,
+    pay_status: DataTypes.STRING,
+    pay_voucher_img: DataTypes.STRING,
+    trade_no: DataTypes.STRING,
+    deliver_man: DataTypes.STRING,
+    deliver_mobile: DataTypes.STRING,
+    deliver_addr: DataTypes.STRING,
+    deliver_express_no: DataTypes.STRING,
+    deliver_express_img: DataTypes.STRING,
+    merchant_deliver_man: DataTypes.STRING,
+    merchant_deliver_mobile: DataTypes.STRING,
+    merchant_deliver_addr: DataTypes.STRING,
+    sve_deliver_express_no: DataTypes.STRING,
+    sve_deliver_express_img: DataTypes.STRING,
+  }, {
+    paranoid: true, //假的删除
+    underscored: true,
+    version: true,
+    freezeTableName: true,
+    //freezeTableName: true,
+    // define the table's name
+    tableName: 'saas_order_deliver_info',
+    validate: {
+
+    },
+    indexes: [
+      // Create a unique index on email
+      //  {
+      //    unique: true,
+      //    fields: ['email']
+      //  },
+      //
+      //  // Creates a gin index on data with the jsonb_path_ops operator
+      //  {
+      //    fields: ['data'],
+      //    using: 'gin',
+      //    operator: 'jsonb_path_ops'
+      //  },
+      //
+      //  // By default index name will be [table]_[fields]
+      //  // Creates a multi column partial index
+      //  {
+      //    name: 'public_by_author',
+      //    fields: ['author', 'status'],
+      //    where: {
+      //      status: 'public'
+      //    }
+      //  },
+      //
+      //  // A BTREE index with a ordered field
+      //  {
+      //    name: 'title_index',
+      //    method: 'BTREE',
+      //    fields: ['author', {attribute: 'title', collate: 'en_US', order: 'DESC', length: 5}]
+      //  }
+    ]
+  });
+}
\ No newline at end of file

xggsve-order/app/base/db/models/saas/saasorderpay.js

+const system = require("../../../system");
+const settings = require("../../../../config/settings");
+const uiconfig = system.getUiConfig2(settings.appKey);
+module.exports = (db, DataTypes) => {
+  return db.define("saasorderpay", {
+    order_id: DataTypes.STRING,
+    pay_type: DataTypes.INTEGER,
+    amount: DataTypes.BIGINT,
+    pay_status: DataTypes.STRING,
+    pay_voucher_img: DataTypes.STRING,
+    trade_no: DataTypes.STRING,
+  }, {
+    paranoid: true, //假的删除
+    underscored: true,
+    version: true,
+    freezeTableName: true,
+    //freezeTableName: true,
+    // define the table's name
+    tableName: 'saas_order_pay',
+    validate: {
+
+    },
+    indexes: [
+      // Create a unique index on email
+      //  {
+      //    unique: true,
+      //    fields: ['email']
+      //  },
+      //
+      //  // Creates a gin index on data with the jsonb_path_ops operator
+      //  {
+      //    fields: ['data'],
+      //    using: 'gin',
+      //    operator: 'jsonb_path_ops'
+      //  },
+      //
+      //  // By default index name will be [table]_[fields]
+      //  // Creates a multi column partial index
+      //  {
+      //    name: 'public_by_author',
+      //    fields: ['author', 'status'],
+      //    where: {
+      //      status: 'public'
+      //    }
+      //  },
+      //
+      //  // A BTREE index with a ordered field
+      //  {
+      //    name: 'title_index',
+      //    method: 'BTREE',
+      //    fields: ['author', {attribute: 'title', collate: 'en_US', order: 'DESC', length: 5}]
+      //  }
+    ]
+  });
+}
\ No newline at end of file