gsb

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

@@ -59,7 +59,9 @@ class ActionAPI extends APIBase {
                 case "orderInfoAll":   // 查订单信息
                     opResult = await this.oorderSve.infoAll(action_body);
                     break;
-
+                case "orderAndDeliver":   // 查订单信息
+                    opResult = await this.oorderSve.orderAndDeliver(action_body);
+                    break;
                 case "orders":           //订单管理（平台）
                     opResult = await this.oorderSve.orders(action_body);
                     break;
@@ -96,6 +98,9 @@ class ActionAPI extends APIBase {
                 case "queryObusinessmen":  //查询个体工商户信息
                     opResult = await this.obusinessmenSve.queryObusinessmen(action_body);
                     break;
+                case "businessmenByOrderId":  //查询个体工商户信息
+                    opResult = await this.obusinessmenSve.businessmenByOrderId(action_body);
+                    break;
                 case "queryObusinessmenInfo":  //查询个体工商户信息
                     opResult = await this.obusinessmenSve.queryObusinessmenInfo(action_body);
                     break;

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

@@ -36,6 +36,11 @@ class ObusinessmenService extends ServiceBase {
     }
   }
 
+  async businessmenByOrderId(params) {
+    let obusinessmen = await this.obusinessmenDao.findOne({order_id: params.order_id});
+    return system.getResultSuccess(obusinessmen);
+  }
+
   /**
    * 查询 saas推送 相关的信息
    * @param {*} params 

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

@@ -206,6 +206,13 @@ class OorderService extends ServiceBase {
     return system.getResultSuccess(result);
   }
 
+  async orderAndDeliver(params) {
+    let order = await this.dao.getById(params.id);
+    let orderDeliver = await this.oorderdeliverDao.getById(order.deliver_id) || {};
+    orderDeliver.deliver_divide = system.f2y(orderDeliver.deliver_divide);
+    return system.getResultSuccess({order: order, orderDeliver: orderDeliver});
+  }
+
   /**
    * 构建产品流程对象
    * @param productPid

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

@@ -626,6 +626,7 @@ class OorderstatusService extends ServiceBase {
     _obusinessmenProperty.deliver_id = this.trim(params.deliver_id);
     _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);
     let orderProperty = {};
     orderProperty.id = _order.id;
     orderProperty.status = this.trim(params.status);
@@ -1041,7 +1042,6 @@ class OorderstatusService extends ServiceBase {
     }
   }
 
-
   /**
    * 阿里建账
    * @param params