ucommune-back operate api

center-order/app/base/api/impl/action/ucommuneOrder.js

@@ -41,8 +41,8 @@ class ucommuneOrder extends APIBase {
             case "getCustomerArea":// 概览-客户地域分布
                 opResult = await this.ucommuneOrderSve.getCustomerArea(pobj, pobj.actionBody);
                 break;
-            case "getOrderInfo":// 订单列表
-                opResult = await this.ucommuneOrderSve.getOrderInfo(pobj, pobj.actionBody);
+            case "getOrderDeliveryInfo":// 订单列表
+                opResult = await this.ucommuneOrderSve.getOrderDeliveryInfo(pobj, pobj.actionBody);
                 break;
             case "getOrderDelivery":// 订单详情
                 opResult = await this.ucommuneOrderSve.getOrderDelivery(pobj, pobj.actionBody);

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

@@ -175,7 +175,7 @@ class OrderInfoService extends ServiceBase {
     return result;
   }
   
-  // 趋势分析
+  // 概览-产品销售分布
   async getProductTypesales(pobj, actionBody) {
     var startTime = moment().subtract(1, "years").format("YYYY-MM-DD HH:mm:ss");
     var entTime = moment().format("YYYY-MM-DD HH:mm:ss");
@@ -208,6 +208,60 @@ class OrderInfoService extends ServiceBase {
     var result = system.getResultSuccess(customerAreaList);
     return result;
   }
+
+  // 交付单列表
+  async getOrderDeliveryInfo(pobj, actionBody) {
+    var pageSize = Number(actionBody.pageSize || 20);
+    if (pageSize > 50) {
+      pageSize = 50;
+    }
+    var pageIndex = Number(actionBody.pageIndex || 1);
+    var from = pageIndex == 1 ? 0 : Number((pageIndex - 1) * pageSize);
+
+    var paramWhere = {};
+    var sql = "SELECT `orderNo`,`channelItemName` AS produuctName,`quantity`,`payTotalSum` AS totalSum,`updated_at` AS updateAt,delivery.deliveryContent AS delivery "
+    + " 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";
+    var sqlCount = "select count(1) as dataCount from v_order LEFT JOIN c_order_delivery as delivery ON v_order.orderNo = delivery.sourceOrderNo "
+    + " where uapp_id=:uappId AND v_order.orderStatus != 1";
+
+    paramWhere.uappId = pobj.appInfo.uapp_id;
+
+    if(actionBody.orderNo) {
+        sql += " and orderNo=:orderNo";
+        sqlCount += " and orderNo=:orderNo";
+        paramWhere.orderNo = actionBody.orderNo;
+    }
+    if(actionBody.tmName) {
+        sql += " and json_extract(delivery.deliveryContent,'$.tm.tmName') =:tmName";
+        sqlCount += " and json_extract(delivery.deliveryContent,'$.tm.tmName') =:tmName";
+        paramWhere.tmName = actionBody.tmName;
+    }
+    if(actionBody.contactName) {
+        sql += " and json_extract(delivery.deliveryContent,'$.apply.name') =:contactName";
+        sqlCount += " and json_extract(delivery.deliveryContent,'$.apply.name') =:contactName";
+        paramWhere.contactName = actionBody.contactName;
+    }
+    if (actionBody.startTime && actionBody.entTime) {
+      var startTime = actionBody.startTime.trim() + " 00:00:00";
+      var entTime = actionBody.entTime + " 23:59:59";
+      sql += " and updated_at >=:startTime and  updated_at<=:entTime";
+      sqlCount += " and updated_at >=:startTime and  updated_at<=:entTime";
+      paramWhere.startTime = startTime;
+      paramWhere.entTime = entTime;
+    }
+
+    sql += " order by v_order.id desc LIMIT " + pageSize + " OFFSET " + from;
+ 
+    var list = await this.customQuery(sql, paramWhere);
+    var result = system.getResultSuccess(list);
+
+    var tmpResultCount = await this.customQuery(sqlCount, paramWhere);
+
+    result.dataCount = tmpResultCount && tmpResultCount.length > 0 ? tmpResultCount[0].dataCount : 0;
+
+    return result;
+  }
   // ----------------------------------------------uk运营后台  结束
 }
 module.exports = OrderInfoService;