d

74bb9bac · 孙亚楠 · 4feda5f9 · 74bb9bac · 74bb9bac · 74bb9bac
Commit 74bb9bac authored May 19, 2020 by 孙亚楠
10 changed files
--- a/xggsve-order/app/base/db/impl/order/obusinessmenDao.js
+++ b/xggsve-order/app/base/db/impl/order/obusinessmenDao.js
@@ -38,6 +38,9 @@ class ObusinessmenDao extends Dao {
  }
  setCondition(sql, params) {
+    if (params.saas_id) {
+      sql.push("AND t1.saas_id = :saas_id");
+    }
    if (params.order_id) {
      sql.push("AND t1.order_id = :order_id");
    }
@@ -84,12 +87,15 @@ class ObusinessmenDao extends Dao {
   * 通过统一社会信用代码
   * @param {*} CreditCode 
   */
-  async findByCreditCode(credit_code){
+  async findByCreditCode(credit_code,saas_id){
    let sql = [];
    sql.push("SELECT");
    sql.push("t1.*");
    sql.push("FROM `o_businessmen` t1");
-    sql.push("WHERE credit_code = :credit_code");
+    sql.push("WHERE t1.credit_code = :credit_code");
+    if(saas_id){
+      sql.push("WHERE t1.saas_id = :saas_id")
+    }
    return await this.customQuery(sql.join(" "), {credit_code:credit_code});
  }

--- a/xggsve-order/app/base/db/impl/order/oorderDao.js
+++ b/xggsve-order/app/base/db/impl/order/oorderDao.js
@@ -204,10 +204,12 @@ class OorderDao extends Dao {
      sql.push("AND t2.deliver_user_id = :deliver_user_id");
    }
    if (params.deliver_user_path) {
-      // sql.push("AND t2.delier_user_id like ':deliver_user_path%'");
      params.deliver_user_path_like = params.deliver_user_path + "%";
      sql.push("AND t2.deliver_user_path like :deliver_user_path_like");
    }
+    if (params.saas_id) {
+      sql.push("AND t1.saas_id = :saas_id");
+    }
  }
  /**

--- a/xggsve-order/app/base/db/impl/order/oorderdeliverDao.js
+++ b/xggsve-order/app/base/db/impl/order/oorderdeliverDao.js
@@ -51,6 +51,7 @@ class OorderdeliverDao extends Dao {
      return [];
    }
    let sql = `SELECT * FROM o_order_deliver WHERE id in (:deliverIdList)`;
    return await this.customQuery(sql, { deliverIdList: ids });
  }
@@ -121,6 +122,10 @@ class OorderdeliverDao extends Dao {
    if (params.createdEnd) {
      sql.push(`AND b.created_at <= :createdEnd`);
    }
+    if (params.saas_id) {
+      sql.push(`AND b.saas_id = :saas_id`);
+      sql.push(`AND a.saas_id = :saas_id`);
+    }
  }
  /**

--- a/xggsve-order/app/base/db/models/order/obusinessmen.js
+++ b/xggsve-order/app/base/db/models/order/obusinessmen.js
@@ -5,6 +5,7 @@
 module.exports = function (db, DataTypes) {
    return db.define('obusinessmen', {
            order_id: {type: DataTypes.STRING, field: 'order_id', allowNull: true, defaultValue:'',comment:'订单id' },
+            saas_id: {type: DataTypes.STRING, field: 'saas_id', allowNull: true, defaultValue:'',comment:'SAAS_ID' },
            merchant_id: {type: DataTypes.STRING, field: 'merchant_id', allowNull: true, comment:'商户id 为了司机宝' },
            channel_order_no: { type: DataTypes.STRING, field: 'channel_order_no', allowNull: true, defaultValue:'', comment:'渠道订单号 为了司机宝'},
            legal_name: { type: DataTypes.STRING, field: 'legal_name', allowNull: false,defaultValue:'', comment:'法人姓名'},
@@ -71,4 +72,3 @@ module.exports = function (db, DataTypes) {
            comment: '个体户表',
        });
 }
\ No newline at end of file
--- a/xggsve-order/app/base/db/models/order/oorder.js
+++ b/xggsve-order/app/base/db/models/order/oorder.js
@@ -5,7 +5,7 @@
 module.exports = function (db, DataTypes) {
    return db.define('oorder', {
            merchant_id: {type: DataTypes.STRING, field: 'merchant_id', allowNull: true, defaultValue:'',comment:'商户id, 为了兼容司机宝' },
-		// order_id: {type: DataTypes.STRING, field: 'order_id', allowNull: true, comment:'订单ID' },
+            saas_id: {type: DataTypes.STRING, field: 'saas_id', allowNull: true, defaultValue:'',comment:'SAAS_ID' },
            busi_type: {type: DataTypes.STRING, field: 'busi_type', allowNull: true,defaultValue:'', comment:'业务类型 1个体户 2...暂不知道' },
            busi_id: { type: DataTypes.STRING, field: 'busi_id', allowNull: false,defaultValue:'', comment:'业务id'},
            product_id: {type: DataTypes.BIGINT, field: 'product_id', allowNull: true,defaultValue:0, comment:'产品id'},

--- a/xggsve-order/app/base/db/models/order/oorderdeliver.js
+++ b/xggsve-order/app/base/db/models/order/oorderdeliver.js
@@ -5,6 +5,7 @@
 module.exports = function (db, DataTypes) {
    return db.define('oorderdeliver', {
            order_id: {type: DataTypes.STRING, field: 'order_id', allowNull: false,comment:'订单ID' },
+            saas_id: {type: DataTypes.STRING, field: 'saas_id', allowNull: true, defaultValue:'',comment:'SAAS_ID' },
            deliver_id: {type: DataTypes.STRING, field: 'deliver_id', allowNull: false, comment:'交付商id' },
            deliver_name: { type: DataTypes.STRING, field: 'deliver_name', allowNull: false, comment:'交付商名称'},
            deliver_divide: {type: DataTypes.STRING, field: 'deliver_divide', allowNull: false,comment:'订单分成' },

--- a/xggsve-order/app/base/db/models/order/oorderinforeg.js
+++ b/xggsve-order/app/base/db/models/order/oorderinforeg.js
@@ -4,6 +4,7 @@
 */
 module.exports = function (db, DataTypes) {
    return db.define('oorderinforeg', {
+            saas_id: {type: DataTypes.STRING, field: 'saas_id', allowNull: true, defaultValue:'',comment:'SAAS_ID' },
            legal_name: {type: DataTypes.STRING, field: 'legal_name', allowNull: true, defaultValue:'',comment:'法人姓名' },
            id_card: {type: DataTypes.STRING, field: 'id_card', allowNull: true, comment:'法人身份证' },
            legal_mobile: { type: DataTypes.STRING, field: 'legal_mobile', allowNull: true, defaultValue:'', comment:'法人电话'},

--- a/xggsve-order/app/base/service/impl/order/obusinessmenSve.js
+++ b/xggsve-order/app/base/service/impl/order/obusinessmenSve.js
@@ -62,10 +62,13 @@ class ObusinessmenService extends ServiceBase {
   * 根据统一社会信用代码查记录
   * @param {*} params 
   * @Id 个体户ID
+   * @Saas_id
   */
  async queryObusinessmenByCreditCode(params) {
+    let credit_code = this.trim(params.credit_code) || "";
+    let saas_id = this.trim(params.saas_id) || "";
    try {
-      let obj = await this.dao.findByCreditCode(this.trim(params.credit_code));
+      let obj = await this.dao.findByCreditCode(credit_code,saas_id);
      if(obj && obj.length>0){
        this.handleDate(obj[0], ["created_at", "assignTime","reg_date","tax_reg_day","updated_at"], null, -8);
      }else{
@@ -111,6 +114,9 @@ class ObusinessmenService extends ServiceBase {
    }
    let _obusinessmen = await this.dao.findById(this.trim(params.id));
+    if(_obusinessmen.saas_id != this.trim(params.saas_id)){
+      return system.getResult(null, `【${saas_id}】错误`);
+    }
    let _order = await this.oorderDao.model.findOne({
      where:{
        id:_obusinessmen.order_id
@@ -296,17 +302,22 @@ class ObusinessmenService extends ServiceBase {
  }
  /**
+   * fn:推送财税系统建账
   * @param {*} params 
   * @id 个体户id
   */
  async updateOBusinessmenProinvce(params){
+    let where = {};
    if(!params.id){
      return system.getResult(null,`参数错误 个体户ID非法`);
+    }else{
+      where.id = this.trim(params.id);
    }
-    let bean = await this.dao.model.findOne({
+    if(params.saas_id){
-      where:{
+      where.saas_id = this.trim(params.saas_id);
-        id:this.trim(params.id)
    }
+    let bean = await this.dao.model.findOne({
+      where:where
    });
    if(!bean){

--- a/xggsve-order/app/base/service/impl/order/oorderSve.js
+++ b/xggsve-order/app/base/service/impl/order/oorderSve.js
@@ -52,6 +52,7 @@ class OorderService extends ServiceBase {
   * @params customer_name  客户名称
   */
  async addSourceOrder(params) {
    // 整理参数
    let order = {
      merchant_id: "",
@@ -69,6 +70,7 @@ class OorderService extends ServiceBase {
    order.saas_deliver_api = this.trim(params.saas_deliver_api);
    order.service_items = this.trim(params.service_items);
    order.ali_deliver_api = this.trim(params.ali_deliver_api) || "";
+    order.saas_id = this.trim(params.saas_id) || "";
    // 验证订单是否存在
    let exists = await this.dao.findOne({ source_id: order.source_id, source_no: order.source_no });
    if (exists) {
@@ -125,6 +127,7 @@ class OorderService extends ServiceBase {
          deliver_divide:self.trim(params.deliver_divide) || 0,
          delier_user_id : self.trim(params.delier_user_id),
          deliver_user_path: self.trim(params.deliver_user_path),
+          saas_id: self.trim(params.saas_id)
        }, t);
        await self.dao.update({id:order.id,deliver_id:_oorderdeliver.id},t);
      }
@@ -154,7 +157,7 @@ class OorderService extends ServiceBase {
    obj.guest_mail_addr = this.trim(params.guest_mail_addr) || "";
    obj.guest_mail_to= this.trim(params.guest_mail_to) || "";
    obj.guest_mail_mobile= this.trim(params.guest_mail_mobile) || "";
+    obj.saas_id= this.trim(params.saas_id) || "";
    // 这些字段在交付系统里暂时没有
    // `bank_front` '银行卡正面照片',
    // `bank_back`  '银行卡背面照片',
@@ -402,6 +405,9 @@ class OorderService extends ServiceBase {
        [this.db.Op.like]: this.trim(params.bd_path) + "%"
      }
    }
+    if (params.saas_id) {
+      where.saas_id = this.trim(params.saas_id);
+    }
    var currentPage = Number(params.currentPage || 1);
    var pageSize = Number(params.pageSize || 10);
@@ -852,7 +858,6 @@ class OorderService extends ServiceBase {
        element.price = system.f2y(element.price);
        element.odeliver.deliver_divide = system.f2y(element.odeliver.deliver_divide);
        element.orderInfoReg.capital = system.f2y(element.orderInfoReg.capital);
      }
      return system.getResult({count: countRes.count, rows: list});
    }catch (e) {
@@ -895,7 +900,9 @@ class OorderService extends ServiceBase {
      statusArray:params.statusArray,
      id:this.trim(params.id),
      createdBegin:params.createdBegin,
-      createdEnd:params.createdEnd
+      createdEnd:params.createdEnd,
+      saas_id:params.saas_id
    };
    if(!params.isManager){//如果是管理员 则可能看到所有的数据
      if(params.isMain){  //如果是主管 则可以看到自己和下属的所有的订单

--- a/xggsve-order/app/base/service/impl/order/oorderdeliverSve.js
+++ b/xggsve-order/app/base/service/impl/order/oorderdeliverSve.js
@@ -33,6 +33,9 @@ class OorderdeliverService extends ServiceBase {
    } else {
      return system.getResult(null, `参数错误 交付商ID不能为空`);
    }
+    if(params.saas_id){
+      where.saas_id = this.trim(params.saas_id);
+    }
    //交付商订单表条件
    if (params.createdBegin && params.createdEnd) {
      where.createdBegin = this.trim(params.createdBegin);