ucommune-back operate api

center-order/app/base/service/impl/dbcorder/ucommuneOrderSve.js

@@ -219,7 +219,10 @@ class OrderInfoService extends ServiceBase {
     var from = pageIndex == 1 ? 0 : Number((pageIndex - 1) * pageSize);
     var from = pageIndex == 1 ? 0 : Number((pageIndex - 1) * pageSize);
 
 
     var paramWhere = {};
     var paramWhere = {};
-    var sql = "SELECT `orderNo`,`channelItemName` AS produuctName,`quantity`,`payTotalSum` AS totalSum,`updated_at` AS updateAt,delivery.deliveryContent AS delivery "
+    var sql = "SELECT `orderNo`,`channelItemName` AS produuctName,`quantity`,`payTotalSum` AS totalSum,`updated_at` AS updateAt, " 
+    + " json_extract ( delivery.deliveryContent, '$.tm.tmName' ) AS tmName ,"
+    + " json_extract ( delivery.deliveryContent, '$.apply.name' ) AS contactName ,"
+    + " json_extract ( delivery.deliveryContent, '$.deliveryStatusName' ) AS deliveryStatusName "
     + " FROM v_order LEFT JOIN c_order_delivery as delivery ON v_order.orderNo = delivery.sourceOrderNo "
     + " FROM v_order LEFT JOIN c_order_delivery as delivery ON v_order.orderNo = delivery.sourceOrderNo "
     + " WHERE v_order.uapp_id =:uappId AND v_order.orderStatus != 1";
     + " WHERE v_order.uapp_id =:uappId AND v_order.orderStatus != 1";
     var sqlCount = "select count(1) as dataCount from v_order LEFT JOIN c_order_delivery as delivery ON v_order.orderNo = delivery.sourceOrderNo "
     var sqlCount = "select count(1) as dataCount from v_order LEFT JOIN c_order_delivery as delivery ON v_order.orderNo = delivery.sourceOrderNo "
@@ -262,6 +265,38 @@ class OrderInfoService extends ServiceBase {
 
 
     return result;
     return result;
   }
   }
+
+  // 交付单详情
+  async getOrderDelivery(pobj, actionBody) {
+    var sql = "select * from c_order_delivery where sourceOrderNo=:sourceOrderNo";
+    var paramWhere = { sourceOrderNo: actionBody.orderNo };
+    var list = await this.customQuery(sql, paramWhere);
+    var result = system.getResultSuccess();
+    result.data = {};
+    if (list && list.length > 0) {
+      if (list[0].deliveryContent) {
+        result.data = list[0].deliveryContent;
+      }
+    }
+    result.data.orderContact = null;
+    if (!actionBody.isGetContact) {
+      var item = await this.ordercontactsDao.getItemByOrderNo(actionBody.orderNo);
+      if (item) {
+        result.data.orderContact = item;
+      }
+    }//是否获取联系人，isGetContact有值则不获取
+    return result;
+    
+    var paramWhere = {
+                
+    }
+    // 根据月份分组支付订单
+    var customerAreaSql = "select province as name, count as value from c_order_region where uapp_id=:uappId" 
+    var customerAreaList = await this.orderRegionDao.customQuery(customerAreaSql,paramWhere);
+
+    var result = system.getResultSuccess(customerAreaList);
+    return result;
+  }
   // ----------------------------------------------uk运营后台  结束
   // ----------------------------------------------uk运营后台  结束
 }
 }
 module.exports = OrderInfoService;
 module.exports = OrderInfoService;