dd

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

@@ -493,8 +493,8 @@ class OorderService extends ServiceBase {
 
       //当月订单的数量统计和订单总金额
       var orderData = await this.dao.statOrderByTime(begin, end) || {};
-      result.orderCount = orderData.orderCount;
-      result.orderPrice = system.f2y(orderData.orderPrice);
+      result.orderCount = orderData[orderData.begin].orderCount;
+      result.orderPrice = system.f2y(orderData[orderData.begin].orderPrice);
 
       result.days = days;
       result.dayCounts = dayCounts;

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

@@ -168,12 +168,14 @@ class OorderdeliverService extends ServiceBase {
       }
       let _deliverArr = Array.from(deliverSet);
 
-      let orderCompletes = await this.dao.orderCompletesCount(_deliverArr, begin, end);
-      let orderHanding = await this.dao.orderHandingCount(_deliverArr, begin, end);
+      let orderCompletes = await this.dao.orderCompletesCount(_deliverArr, begin, end) ;
+      let orderHanding = await this.dao.orderHandingCount(_deliverArr, begin, end) ;
+      
       for (let item of deliverList) {
-        item.order_complete_count = orderCompletes[item.deliver_id];
-        item.order_handing_count = orderHanding[item.deliver_id];
+        item.order_complete_count = orderCompletes[item.deliver_id] || 0;
+        item.order_handing_count = orderHanding[item.deliver_id] || 0;
       }
+
       return system.getResult(deliverList);
     } catch (error) {
       console.log(error);