d

050aea2a · 孙亚楠 · 444b026c · 050aea2a · 050aea2a · 050aea2a
Commit 050aea2a authored May 20, 2020 by 孙亚楠
6 changed files
--- a/xggsve-order/app/base/db/impl/order/obusinessmenDao.js
+++ b/xggsve-order/app/base/db/impl/order/obusinessmenDao.js
@@ -124,9 +124,16 @@ class ObusinessmenDao extends Dao {
   * 提送发票
   * @param {*} id 
   */
-  async queryObusinessmenInfo(id){
+  async queryObusinessmenInfo(params){
-    let sql = `SELECT t1.source_no,t1.saas_deliver_api ,t1.product_id,t1.merchant_id,t2.* FROM o_order t1 INNER JOIN o_businessmen t2 ON t1.id = t2.order_id WHERE t1.id = :id `;
+    let sql = [`SELECT t1.source_no,t1.saas_deliver_api ,t1.product_id,t1.merchant_id,t2.* FROM o_order t1 INNER JOIN o_businessmen t2 ON t1.id = t2.order_id WHERE 1=1 `];
-    let list = await this.customQuery(sql, {id: id}) || [];
+    if(params.id){
+      sql.push(` and t1.id = :id`);
+    }
+    if(params.saas_id){
+      sql.push(` and t2.saas_id = :saas_id`);
+      sql.push(` and t1.saas_id = :saas_id`);
+    }
+    let list = await this.customQuery(sql.join(" "), params) || [];
    if (list.length == 0) {
      return {};
    }

--- a/xggsve-order/app/base/db/models/order/obusinessmen.js
+++ b/xggsve-order/app/base/db/models/order/obusinessmen.js
@@ -59,8 +59,8 @@ module.exports = function (db, DataTypes) {
            deliver_id: { type: DataTypes.STRING, field: 'deliver_id', allowNull: true ,comment:"交付商id"},
            delier_user_id: { type: DataTypes.STRING, field: 'delier_user_id', allowNull: true ,comment:"交付商用户id"},
            deliver_user_path: { type: DataTypes.STRING, field: 'deliver_user_path', allowNull: true ,comment:"交付商组织机构path"},
-            created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false, defaultValue: DataTypes.NOW },
+            created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false},
-            updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false, defaultValue: DataTypes.NOW },
+            updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false},
            deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true }
        },
        {

--- a/xggsve-order/app/base/service/impl/order/obusinessmenSve.js
+++ b/xggsve-order/app/base/service/impl/order/obusinessmenSve.js
@@ -50,7 +50,7 @@ class ObusinessmenService extends ServiceBase {
      return system.getResult(null,`参数错误 订单ID不能为空`);
    }
    try {
-      let businessmenBean = await this.dao.queryObusinessmenInfo(this.trim(params.id));
+      let businessmenBean = await this.dao.queryObusinessmenInfo(params);
      return system.getResult(businessmenBean);
    } catch (error) {
      console.log(error);

--- a/xggsve-order/app/base/service/impl/order/oorderSve.js
+++ b/xggsve-order/app/base/service/impl/order/oorderSve.js
@@ -57,8 +57,7 @@ class OorderService extends ServiceBase {
      merchant_id: "",
      channel_order_no: "",
      busi_type: 1,
-      busi_id: "",
+      busi_id: ""
-      price: 0,
    };
    order.product_id = Number(params.product_id);
    order.source_id = Number(params.source_id);
@@ -70,6 +69,7 @@ class OorderService extends ServiceBase {
    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) || "";
+    order.price = params.price || 0
    try {
      // 验证订单是否存在
      let exists = await this.dao.findOne({ source_id: order.source_id, source_no: order.source_no });
@@ -823,7 +823,11 @@ class OorderService extends ServiceBase {
    params.currentPage = Number(params.currentPage || 1);
    params.pageSize = Number(params.pageSize || 10);
    params.startRow = (params.currentPage - 1) * params.pageSize;
-    params.source_id = "1003";
+    if(params.source_id){
+      params.source_id = params.source_id;
+    }else{
+      params.source_id = "1002";
+    }
    try{
      let countRes = await this.dao.aliCountOrder(params);
      if(countRes.count==0){

--- a/xggsve-order/app/base/service/impl/order/oorderstatusSve.js
+++ b/xggsve-order/app/base/service/impl/order/oorderstatusSve.js
@@ -168,8 +168,8 @@ class OorderstatusService extends ServiceBase {
    _oorderinforegProperty.legal_mobile = this.trim(params.legal_mobile);
    _oorderinforegProperty.names = this.trim(params.names);
    _oorderinforegProperty.capital = this.trim(params.capital);
-    _oorderinforegProperty.domicile_id = this.trim(params.domicile_id);
+    _oorderinforegProperty.domicile_id = this.trim(params.domicile_id) || "";
-    _oorderinforegProperty.domicile_name = this.trim(params.domicile_name);
+    _oorderinforegProperty.domicile_name = this.trim(params.domicile_name) || "";
    _oorderinforegProperty.business_scope_id = this.trim(params.business_scope_id);
    _oorderinforegProperty.business_type = this.trim(params.business_type);
    _oorderinforegProperty.business_scope = this.trim(params.business_scope);
@@ -220,12 +220,12 @@ class OorderstatusService extends ServiceBase {
    if (!params.capital) {
      return system.getResult(null, `参数错误 注册资本不能为空`);
    }
-    if (!params.domicile_id) {
+    // if (!params.domicile_id) {
-      return system.getResult(null, `参数错误 注册地id不能为空`);
+    //   return system.getResult(null, `参数错误 注册地id不能为空`);
-    }
+    // }
-    if (!params.domicile_name) {
+    // if (!params.domicile_name) {
-      return system.getResult(null, `参数错误 注册地名称不能为空`);
+    //   return system.getResult(null, `参数错误 注册地名称不能为空`);
-    }
+    // }
    if (!params.business_scope_id) {
      return system.getResult(null, `参数错误 经营范围id不能为空`);
    }
@@ -613,7 +613,9 @@ class OorderstatusService extends ServiceBase {
    let _order = params._order;
    let _orderInfo = await this.oorderinforegDao.findById(_order.id);
+    if(!_orderInfo.saas_id || !_order.saas_id){
+      return system.getResult(null,`系统错误，请联系系统管理员`);
+    }
    let _obusinessmenProperty = {};
    _obusinessmenProperty.name = this.trim(params.name);
    _obusinessmenProperty.credit_code = this.trim(params.credit_code);
@@ -632,6 +634,7 @@ class OorderstatusService extends ServiceBase {
    _obusinessmenProperty.delier_user_id = this.trim(params.delier_user_id);
    _obusinessmenProperty.deliver_user_path= this.trim(params.deliver_user_path);
    _obusinessmenProperty.company_id = this.trim(params.company_id);
+    _obusinessmenProperty.saas_id = _orderInfo.saas_id || "";
    let orderProperty = {};
    orderProperty.id = _order.id;
    orderProperty.status = this.trim(params.status);

--- a/xggsve-order/app/base/service/impl/saas/saasorderSve.js
+++ b/xggsve-order/app/base/service/impl/saas/saasorderSve.js
@@ -300,7 +300,7 @@ class SaasOrderService extends ServiceBase {
    page.rows = await this.dao.listByCondition(params);
    if (page.rows) {
      for (var row of page.rows) {
-        this.handleDate(row, ["created_at"], null, -8);
+        this.handleDate(row, ["created_at"], null );
      }
      await this.setBminfo(page.rows);